Changeset 82222 in webkit

Timestamp:

Mar 29, 2011 3:31:46 AM (13 years ago)

Author:

eae@chromium.org

Message:

2011-03-29 Emil A Eklund <​eae@chromium.org>

Reviewed by Darin Adler.

getComputedStyle counterIncrement crash @ WebCore::counterToCSSValue
​https://bugs.webkit.org/show_bug.cgi?id=57266

Add test for getComputedStyle(...).counterIncrement without a counter.

• fast/css/getComputedStyle/counterIncrement-without-counter-expected.txt: Added.
• fast/css/getComputedStyle/counterIncrement-without-counter.html: Added.

2011-03-29 Emil A Eklund <​eae@chromium.org>

Reviewed by Darin Adler.

getComputedStyle counterIncrement crash @ WebCore::counterToCSSValue
​https://bugs.webkit.org/show_bug.cgi?id=57266

Add null check to counterToCSSValue.

Test: fast/css/getComputedStyle/counterIncrement-without-counter.html

• css/CSSComputedStyleDeclaration.cpp: (WebCore::counterToCSSValue):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/counterIncrement-without-counter-expected.txt (added)
• LayoutTests/fast/css/getComputedStyle/counterIncrement-without-counter.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-29  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        getComputedStyle counterIncrement crash @ WebCore::counterToCSSValue
+        https://bugs.webkit.org/show_bug.cgi?id=57266
+
+        Add test for getComputedStyle(...).counterIncrement without a counter.
+
+        * fast/css/getComputedStyle/counterIncrement-without-counter-expected.txt: Added.
+        * fast/css/getComputedStyle/counterIncrement-without-counter.html: Added.
+
 2011-03-29  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-29  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        getComputedStyle counterIncrement crash @ WebCore::counterToCSSValue
+        https://bugs.webkit.org/show_bug.cgi?id=57266
+
+        Add null check to counterToCSSValue.
+
+        Test: fast/css/getComputedStyle/counterIncrement-without-counter.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::counterToCSSValue):
+
 2011-03-29  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -771 +771 @@
 static PassRefPtr<CSSValue> counterToCSSValue(const RenderStyle* style, int propertyID, CSSPrimitiveValueCache* primitiveValueCache)
 {
+    const CounterDirectiveMap* map = style->counterDirectives();
+    if (!map)
+        return 0;
+
     RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
-    const CounterDirectiveMap* map = style->counterDirectives();
     for (CounterDirectiveMap::const_iterator it = map->begin(); it != map->end(); ++it) {
         list->append(primitiveValueCache->createValue(it->first.get(), CSSPrimitiveValue::CSS_STRING));