Changeset 167524 in webkit

Timestamp:

Apr 18, 2014, 5:49:07 PM (12 years ago)

Author:

jhoneycutt@apple.com

Message:

Harden RenderInline::inlineElementContinuation()

<​https://bugs.webkit.org/show_bug.cgi?id=131858>

Reviewed by Sam Weinig.

No new tests, as there are no known cases of this happening.

• rendering/RenderInline.cpp:

(WebCore::RenderInline::inlineElementContinuation):
Return nullptr if the continuation is neither a RenderInline nor a
RenderBlock.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Harden RenderInline::inlineElementContinuation()
+
+        <https://bugs.webkit.org/show_bug.cgi?id=131858>
+
+        Reviewed by Sam Weinig.
+
+        No new tests, as there are no known cases of this happening.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::inlineElementContinuation):
+        Return nullptr if the continuation is neither a RenderInline nor a
+        RenderBlock.
+
 2014-04-18  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -120 +120 @@
 {
     RenderBoxModelObject* continuation = this->continuation();
-    if (!continuation || continuation->isRenderInline())
+    if (!continuation)
+        return nullptr;
+
+    if (continuation->isRenderInline())
         return toRenderInline(continuation);
-    return toRenderBlock(continuation)->inlineElementContinuation();
+
+    return continuation->isRenderBlock() ? toRenderBlock(continuation)->inlineElementContinuation() : nullptr;
 }