[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

antti at apple.com antti at apple.com
Mon Feb 21 00:14:55 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit f67fc8a21a039a089ede2343251099ea0ed90255
Author: antti at apple.com <antti at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 29 00:23:39 2011 +0000

    CSS styles are shared based on uninitialized property values
    https://bugs.webkit.org/show_bug.cgi?id=53285
    
    Reviewed by Simon Fraser.
    
    Null test.
    
    * dom/NamedNodeMap.cpp:
    (WebCore::NamedNodeMap::mappedMapsEquivalent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a35c813..221bf52 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  Antti Koivisto  <antti at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        CSS styles are shared based on uninitialized property values
+        https://bugs.webkit.org/show_bug.cgi?id=53285
+        
+        Null test.
+
+        * dom/NamedNodeMap.cpp:
+        (WebCore::NamedNodeMap::mappedMapsEquivalent):
+
 2011-01-27  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/Source/WebCore/dom/NamedNodeMap.cpp b/Source/WebCore/dom/NamedNodeMap.cpp
index 0e2861e..2861226 100644
--- a/Source/WebCore/dom/NamedNodeMap.cpp
+++ b/Source/WebCore/dom/NamedNodeMap.cpp
@@ -357,7 +357,7 @@ bool NamedNodeMap::mappedMapsEquivalent(const NamedNodeMap* otherMap) const
             ASSERT(attr->isMappedAttribute());
 
             Attribute* otherAttr = otherMap->getAttributeItem(attr->name());
-            if (!otherAttr || attr->value() != otherAttr->value())
+            if (!otherAttr || !otherAttr->decl() || attr->value() != otherAttr->value())
                 return false;
             if (!attr->decl()->propertiesEqual(otherAttr->decl()))
                 return false;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list