Title: [141460] branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp
- Revision
- 141460
- Author
- jchaffr...@webkit.org
- Date
- 2013-01-31 12:02:25 -0800 (Thu, 31 Jan 2013)
Log 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=jchaffr...@webkit.org
Review URL: https://codereview.chromium.org/12084093
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp (141459 => 141460)
--- branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-01-31 20:00:12 UTC (rev 141459)
+++ branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-01-31 20:02:25 UTC (rev 141460)
@@ -1670,7 +1670,7 @@
}
// 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;
if (numLinesHanging < style()->widows()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
