Title: [141009] trunk/Source/WebCore
- Revision
- 141009
- Author
- jchaffr...@webkit.org
- Date
- 2013-01-28 14:28:21 -0800 (Mon, 28 Jan 2013)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141008 => 141009)
--- trunk/Source/WebCore/ChangeLog 2013-01-28 22:22:16 UTC (rev 141008)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 22:28:21 UTC (rev 141009)
@@ -1,3 +1,19 @@
+2013-01-28 Julien Chaffraix <jchaffr...@webkit.org>
+
+ 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.
+
2013-01-28 Tony Chang <t...@chromium.org>
"clang: warning: not using the clang compiler for C++ inputs" due to hard-coding of /usr/bin/clang in WebCore.gyp
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (141008 => 141009)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-01-28 22:22:16 UTC (rev 141008)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-01-28 22:28:21 UTC (rev 141009)
@@ -1667,7 +1667,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
