[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9663f1f2860da0123aff643605080aaf74631332
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 2 00:53:49 2003 +0000

    	Add a cycle check when importing stylesheets to prevent
    	infinite loops.
    
            Reviewed by john
    
            * khtml/css/css_ruleimpl.cpp:
            (CSSImportRuleImpl::init):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e09084a..23196e5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Add a cycle check when importing stylesheets to prevent
+	infinite loops.
+	
+        Reviewed by john
+
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSImportRuleImpl::init):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Table rows don't know their precise dimensions, so repainting
 	them fails.  For now, just make an invalidation of a table
 	row due to CSS changes invalidate the whole table.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e09084a..23196e5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Add a cycle check when importing stylesheets to prevent
+	infinite loops.
+	
+        Reviewed by john
+
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSImportRuleImpl::init):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Table rows don't know their precise dimensions, so repainting
 	them fails.  For now, just make an invalidation of a table
 	row due to CSS changes invalidate the whole table.
diff --git a/WebCore/khtml/css/css_ruleimpl.cpp b/WebCore/khtml/css/css_ruleimpl.cpp
index 6194fa1..a9f60ab 100644
--- a/WebCore/khtml/css/css_ruleimpl.cpp
+++ b/WebCore/khtml/css/css_ruleimpl.cpp
@@ -174,6 +174,15 @@ void CSSImportRuleImpl::init()
       absHref = KURL(doc->URL(),m_strHref.string()).url();
     }
 */
+
+    // Check for a cycle in our import chain.  If we encounter a stylesheet
+    // in our parent chain with the same URL, then just bail.
+    for (parent = static_cast<StyleBaseImpl*>(this)->parent();
+         parent;
+         parent = parent->parent())
+        if (absHref == parent->baseURL())
+            return;
+    
     // ### pass correct charset here!!
     m_cachedSheet = docLoader->requestStyleSheet(absHref, QString::null);
 

-- 
WebKit Debian packaging