[SCM] WebKit Debian packaging branch, debian/unstable, updated. upstream/1.1.20-241-g73d16d1

Gustavo Noronha Silva kov at debian.org
Thu Feb 4 22:26:40 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit e2788fb8f8747840fc4b7457a3ada9e6c0af22ef
Author: adele at apple.com <adele at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 01:52:15 2010 +0000

    WebCore: Fix for <rdar://problem/7594212>
    https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
    CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
    
    Reviewed by Simon Fraser.
    
    Test: fast/css/counters/counter-before-selector-crash.html
    
    * rendering/RenderCounter.cpp: (WebCore::updateCounters): nil check.
    
    LayoutTests: Test for: <rdar://problem/7594212>
    https://bugs.webkit.org/show_bug.cgi?id=34549 - CSS counters crash at http://www.w3.org/TR/css3-content/
    CrashTracer: [USER] 20 crashes in Safari at com.apple.WebCore: WebCore::CounterNode::insertAfter + 319
    
    Reviewed by Simon Fraser.
    
    * fast/css/counters/counter-before-selector-crash-expected.txt: Added.
    * fast/css/counters/counter-before-selector-crash.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54317 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/rendering/RenderCounter.cpp b/WebCore/rendering/RenderCounter.cpp
index 46bf9f4..3cb9a07 100644
--- a/WebCore/rendering/RenderCounter.cpp
+++ b/WebCore/rendering/RenderCounter.cpp
@@ -430,7 +430,8 @@ static void updateCounters(RenderObject* renderer)
             continue;
         if (parent)
             parent->removeChild(node, it->first.get());
-        newParent->insertAfter(node, newPreviousSibling, it->first.get());
+        if (newParent)
+            newParent->insertAfter(node, newPreviousSibling, it->first.get());
     }
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list