[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit db76d2dbcef980b09a0fb309b0e4d48d079e28d8
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 15:23:32 2010 +0000

    2010-11-01  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dirk Schulze.
    
            Check for NULL node in SVGUseElement::associateInstancesWithShadowTreeElements loop
            https://bugs.webkit.org/show_bug.cgi?id=48741
    
            * svg/custom/use-on-use-with-child-and-empty-target-expected.txt: Added.
            * svg/custom/use-on-use-with-child-and-empty-target.svg: Added.
    2010-11-01  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Dirk Schulze.
    
            Check for NULL node in SVGUseElement::associateInstancesWithShadowTreeElements loop
            https://bugs.webkit.org/show_bug.cgi?id=48741
    
            Test: svg/custom/use-on-use-with-child-and-empty-target.svg
    
            * svg/SVGUseElement.cpp:
            (WebCore::SVGUseElement::associateInstancesWithShadowTreeElements):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 73c0559..d42abda 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-01  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dirk Schulze.
+
+        Check for NULL node in SVGUseElement::associateInstancesWithShadowTreeElements loop
+        https://bugs.webkit.org/show_bug.cgi?id=48741
+
+        * svg/custom/use-on-use-with-child-and-empty-target-expected.txt: Added.
+        * svg/custom/use-on-use-with-child-and-empty-target.svg: Added.
+
 2010-11-01  Adam Roben  <aroben at apple.com>
 
         Add two more failing tests to the WebKit2 Skipped file
diff --git a/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target-expected.txt b/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target-expected.txt
new file mode 100644
index 0000000..9bcb4f4
--- /dev/null
+++ b/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target-expected.txt
@@ -0,0 +1,2 @@
+PASS: This should not crash.
+
diff --git a/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target.svg b/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target.svg
new file mode 100644
index 0000000..05b1f25
--- /dev/null
+++ b/LayoutTests/svg/custom/use-on-use-with-child-and-empty-target.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <script>
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+    </script>
+    <text y="20">PASS: This should not crash.</text>
+    <set id="set"/>
+    <use id="use" xlink:href="#set">x</use>
+    <use xlink:href="#use"/>
+</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d0fae86..0600f21 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Dirk Schulze.
+
+        Check for NULL node in SVGUseElement::associateInstancesWithShadowTreeElements loop
+        https://bugs.webkit.org/show_bug.cgi?id=48741
+
+        Test: svg/custom/use-on-use-with-child-and-empty-target.svg
+
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::associateInstancesWithShadowTreeElements):
+
 2010-11-01  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/svg/SVGUseElement.cpp b/WebCore/svg/SVGUseElement.cpp
index 474b0a4..75ed4c5 100644
--- a/WebCore/svg/SVGUseElement.cpp
+++ b/WebCore/svg/SVGUseElement.cpp
@@ -948,6 +948,9 @@ void SVGUseElement::associateInstancesWithShadowTreeElements(Node* target, SVGEl
         while (node && !node->isSVGElement())
            node = node->nextSibling();
 
+        if (!node)
+            break;
+
         associateInstancesWithShadowTreeElements(node, instance);
         node = node->nextSibling();
     }

-- 
WebKit Debian packaging