Changeset 121764 in webkit

Timestamp:

Jul 3, 2012 7:44:19 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

[REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries
​https://bugs.webkit.org/show_bug.cgi?id=90459

Reviewed by Andreas Kling.

Source/WebCore:

Create StyleRuleMedia with a non-NULL MediaQuerySet. The respective NULL checks for it were all over the code,
except the copy constructor. Added the check, just in case.

• css/CSSParser.cpp:

(WebCore::CSSParser::createMediaRule):

• css/StyleRule.cpp:

(WebCore::StyleRuleMedia::StyleRuleMedia):

LayoutTests:

• inspector/styles/get-set-stylesheet-text-expected.txt:
• inspector/styles/resources/get-set-stylesheet-text.css:

(@media):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/styles/get-set-stylesheet-text-expected.txt (modified) (1 diff)
• LayoutTests/inspector/styles/resources/get-set-stylesheet-text.css (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/StyleRule.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-03  Alexander Pavlov  <apavlov@chromium.org>
+
+        [REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries
+        https://bugs.webkit.org/show_bug.cgi?id=90459
+
+        Reviewed by Andreas Kling.
+
+        * inspector/styles/get-set-stylesheet-text-expected.txt:
+        * inspector/styles/resources/get-set-stylesheet-text.css:
+        (@media):
+
 2012-07-03  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/LayoutTests/inspector/styles/get-set-stylesheet-text-expected.txt

@@ -15 +15 @@
     important:!important;
     color: "badcolor" ! important /* good property with strange value */;
+}
+
+@media {
+    /* @media rule with an empty media list */
 }
 

trunk/LayoutTests/inspector/styles/resources/get-set-stylesheet-text.css

@@ -10 +10 @@
 }
 
+@media {
+    /* @media rule with an empty media list */
+}
+
 /* comment before selector */body.main1/* comment after selector */{/* comment */color: #F00BAA;zoo:moo /* not an !important unrecognized property */}/* comment */
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-03  Alexander Pavlov  <apavlov@chromium.org>
+
+        [REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries
+        https://bugs.webkit.org/show_bug.cgi?id=90459
+
+        Reviewed by Andreas Kling.
+
+        Create StyleRuleMedia with a non-NULL MediaQuerySet. The respective NULL checks for it were all over the code,
+        except the copy constructor. Added the check, just in case.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createMediaRule):
+        * css/StyleRule.cpp:
+        (WebCore::StyleRuleMedia::StyleRuleMedia):
+
 2012-07-03  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -9402 +9402 @@
     RefPtr<StyleRuleMedia> rule;
     if (rules)
-        rule = StyleRuleMedia::create(media, *rules);
+        rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create(), *rules);
     else {
         RuleList emptyRules;
-        rule = StyleRuleMedia::create(media, emptyRules);
+        rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create(), emptyRules);
     }
     StyleRuleMedia* result = rule.get();

trunk/Source/WebCore/css/StyleRule.cpp

@@ -286 +286 @@
 StyleRuleMedia::StyleRuleMedia(const StyleRuleMedia& o)
     : StyleRuleBlock(o)
-    , m_mediaQueries(o.m_mediaQueries->copy())
-{
+{
+    if (o.m_mediaQueries)
+        m_mediaQueries = o.m_mediaQueries->copy();
 }