Changeset 30153 in webkit

Timestamp:

Feb 11, 2008 1:19:01 PM (16 years ago)

Author:

hyatt@apple.com

Message:

Fix for bug 17286, crash accessing a null RenderStyle. Add a simple null check.

Reviewed by aroben

Added fast/css/empty-generated-content.html

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::checkOneSelector):

Location:

trunk

Files:

• LayoutTests/fast/css/empty-generated-content.html (added)
• LayoutTests/platform/mac/fast/css/empty-generated-content-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/empty-generated-content-expected.png (added)
• LayoutTests/platform/mac/fast/css/empty-generated-content-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-11  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 17286, crash accessing a null RenderStyle.  Add a simple null check.
+
+        Reviewed by aroben
+
+        Added fast/css/empty-generated-content.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::checkOneSelector):
+
 2008-02-11  Rob Buis  <buis@kde.org>
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1661 +1661 @@
                 }
                 if (!m_collectRulesOnly) {
-                    if (m_element == e)
+                    if (m_element == e && m_style)
                         m_style->setEmptyState(result);
                     else if (e->renderStyle() && (e->document()->usesSiblingRules() || e->renderStyle()->unique()))