Changeset 95386 in webkit

Timestamp:

Sep 17, 2011 4:12:16 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=68307

Crash in border image cssText. Make sure to null check all the components, since they're all
optional now.

Reviewed by Sam Weinig.

Source/WebCore:

Added fast/borders/border-image-slice-omission.html

• css/CSSBorderImageValue.cpp:

(WebCore::CSSBorderImageValue::cssText):

LayoutTests:

• fast/borders/border-image-slice-omission.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/borders/border-image-slice-omission-expected.txt (added)
• LayoutTests/fast/borders/border-image-slice-omission.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSBorderImageValue.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-17  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68307
+        
+        Crash in border image cssText. Make sure to null check all the components, since they're all
+        optional now.
+
+        Reviewed by Sam Weinig.
+
+        * fast/borders/border-image-slice-omission.html: Added.
+
 2011-09-17  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-17  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68307
+        
+        Crash in border image cssText. Make sure to null check all the components, since they're all
+        optional now.
+
+        Reviewed by Sam Weinig.
+
+        Added fast/borders/border-image-slice-omission.html
+
+        * css/CSSBorderImageValue.cpp:
+        (WebCore::CSSBorderImageValue::cssText):
+
 2011-09-17  Aaron Boodman  <aa@chromium.org>
 

trunk/Source/WebCore/css/CSSBorderImageValue.cpp

@@ -44 +44 @@
 {
     // Image first.
-    String text(m_image->cssText());
-    text += " ";
+    String text;
+    
+    if (m_image)
+        text += m_image->cssText();
 
     // Now the slices.
-    text += m_imageSlice->cssText();
+    if (m_imageSlice) {
+        if (!text.isEmpty())
+            text += " ";
+        text += m_imageSlice->cssText();
+    }
 
     // Now the border widths.
@@ -63 +69 @@
     if (m_repeat) {
         // Now the keywords.
-        text += " ";
+        if (!text.isEmpty())
+            text += " ";
         text += m_repeat->cssText();
     }