Changeset 151946 in webkit

Timestamp:

Jun 24, 2013 6:28:19 PM (11 years ago)

Author:

Simon Fraser

Message:

Don't crash if renderName() is called on a renderer with no style
​https://bugs.webkit.org/show_bug.cgi?id=117960

Reviewed by Dave Hyatt.

Calling renderName() at the top of RenderObject::willChangeStyle() when
adding debug logging would often crash because various functions called
from renderName() assume style is non-null. Fix this.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::renderName):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::renderName):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderInline.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't crash if renderName() is called on a renderer with no style
+        https://bugs.webkit.org/show_bug.cgi?id=117960
+
+        Reviewed by Dave Hyatt.
+
+        Calling renderName() at the top of RenderObject::willChangeStyle() when
+        adding debug logging would often crash because various functions called
+        from renderName() assume style is non-null. Fix this.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::renderName):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::renderName):
+
 2013-06-24  Alex Christensen  <achristensen@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -7959 +7959 @@
     if (isOutOfFlowPositioned())
         return "RenderBlock (positioned)";
-    if (isAnonymousColumnsBlock())
+    if (style() && isAnonymousColumnsBlock())
         return "RenderBlock (anonymous multi-column)";
-    if (isAnonymousColumnSpanBlock())
+    if (style() && isAnonymousColumnSpanBlock())
         return "RenderBlock (anonymous multi-column span)";
-    if (isAnonymousBlock())
+    if (style() && isAnonymousBlock())
         return "RenderBlock (anonymous)";
     // FIXME: Temporary hack while the new generated content system is being implemented.
@@ -7974 +7974 @@
     if (isStickyPositioned())
         return "RenderBlock (sticky positioned)";
-    if (isRunIn())
+    if (style() && isRunIn())
         return "RenderBlock (run-in)";
     return "RenderBlock";

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -757 +757 @@
     if (isAnonymous())
         return "RenderInline (generated)";
-    if (isRunIn())
+    if (style() && isRunIn())
         return "RenderInline (run-in)";
     return "RenderInline";