[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 6485b3a95a1f795fd37c44cc5521608af2d15896
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 30 19:19:52 2004 +0000

    	Fix for 3639530, regression on generated content pages.  They crash because I forgot to null-check the style
    	object.
    
            Reviewed by kocienda
    
            * khtml/css/cssstyleselector.cpp:
            (khtml::CSSStyleSelector::checkOneSelector):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3b1ce04..e393c05 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3639530, regression on generated content pages.  They crash because I forgot to null-check the style
+	object.
+	
+        Reviewed by kocienda
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::checkOneSelector):
+
 2004-04-30  John Sullivan  <sullivan at apple.com>
 
         - added bridge method to get the NSFont used to render a node, to
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 8786556..5d94bd4 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1039,7 +1039,7 @@ bool CSSStyleSelector::checkOneSelector(DOM::CSSSelector *sel, DOM::ElementImpl
         }
         else if (sel->match == CSSSelector::Id)
             return e->hasID() && e->getIDAttribute() == sel->value;
-        else if (e != element || !htmlElement || !htmlElement->isMappedAttribute(sel->attr))
+        else if (style && (e != element || !htmlElement || !htmlElement->isMappedAttribute(sel->attr)))
             style->setAffectedByAttributeSelectors();
 
         const AtomicString& value = e->getAttribute(sel->attr);

-- 
WebKit Debian packaging