Changeset 141460 in webkit

Timestamp:

Jan 31, 2013, 12:02:25 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Merge 141009

Crash inside RenderBlock::layoutRunsAndFloatsInRange in the widow code
​https://bugs.webkit.org/show_bug.cgi?id=108084

Reviewed by Dean Jackson.

This is a blind fix based on the code and Chromium's stack-traces.

Unfortunately no new test as I couldn't get a local reproduction.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutRunsAndFloatsInRange):
Added a missing NULL-check: the previous 'while' finish if |lineBox|
is NULL and we don't want to crash in this case.

TBR=​jchaffraix@webkit.org
Review URL: ​https://codereview.chromium.org/12084093

File:

• branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1671 +1671 @@
 
         // If there were no breaks in the block, we didn't create any widows.
-        if (!lineBox->isFirstAfterPageBreak() || lineBox == firstLineInBlock)
+        if (!lineBox || !lineBox->isFirstAfterPageBreak() || lineBox == firstLineInBlock)
             return;