<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184088] releases/WebKitGTK/webkit-2.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184088">184088</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 06:08:11 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182974">r182974</a> - Large values for line-height cause integer overflow in RenderStyle::computedLineHeight
https://bugs.webkit.org/show_bug.cgi?id=143863
Reviewed by Rob Buis.
Source/WebCore:
When we compute huge values for line-height through percentage or CSS
calc, we'll overflow the integer and later on
ShapeOutsideInfo::computeDeltasForContainingBlockLine will ASSERT
because it expects non-negative line height. So for the computed
line-height, clamp to an integer range to avoid overflow. Note that
the code path for percentages here is safe because LayoutUnit clamps
to an int on conversion.
This is based on a Blink patch by Rob Buis.
Test: fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::computedLineHeight): Clamp line-height to an
int to avoid overflow.
LayoutTests:
Simplified test from a fuzzer.
* fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt: Added.
* fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingstyleRenderStylecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativelineheightcrashexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativelineheightcrashhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184087 => 184088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 13:05:22 UTC (rev 184087)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 13:08:11 UTC (rev 184088)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-17 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ Large values for line-height cause integer overflow in RenderStyle::computedLineHeight
+ https://bugs.webkit.org/show_bug.cgi?id=143863
+
+ Reviewed by Rob Buis.
+
+ Simplified test from a fuzzer.
+
+ * fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html: Added.
+
</ins><span class="cx"> 2015-04-15 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> String.prototype.startsWith/endsWith/includes have wrong length in r182673
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativelineheightcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt (0 => 184088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash-expected.txt 2015-05-11 13:08:11 UTC (rev 184088)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it doesn't crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastshapesshapeoutsidefloatsshapeoutsidenegativelineheightcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html (0 => 184088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html 2015-05-11 13:08:11 UTC (rev 184088)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<style>
+body {
+ font: calc( 10000 * 1000% )/calc( 10000 * 1000% ) sans-serif;
+}
+p {
+ -webkit-shape-outside: circle();
+ float: right;
+}
+</style>
+<body>
+ <p>This test passes if it doesn't crash.</p>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184087 => 184088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:05:22 UTC (rev 184087)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:08:11 UTC (rev 184088)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-04-17 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ Large values for line-height cause integer overflow in RenderStyle::computedLineHeight
+ https://bugs.webkit.org/show_bug.cgi?id=143863
+
+ Reviewed by Rob Buis.
+
+ When we compute huge values for line-height through percentage or CSS
+ calc, we'll overflow the integer and later on
+ ShapeOutsideInfo::computeDeltasForContainingBlockLine will ASSERT
+ because it expects non-negative line height. So for the computed
+ line-height, clamp to an integer range to avoid overflow. Note that
+ the code path for percentages here is safe because LayoutUnit clamps
+ to an int on conversion.
+
+ This is based on a Blink patch by Rob Buis.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-negative-line-height-crash.html
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::computedLineHeight): Clamp line-height to an
+ int to avoid overflow.
+
</ins><span class="cx"> 2015-04-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderTableCell::computeCollapsed*Border() should check if the cell is still attached to the render tree.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.cpp (184087 => 184088)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-11 13:05:22 UTC (rev 184087)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-11 13:08:11 UTC (rev 184088)
</span><span class="lines">@@ -1396,7 +1396,7 @@
</span><span class="cx"> if (lh.isPercent())
</span><span class="cx"> return minimumValueForLength(lh, fontSize());
</span><span class="cx">
</span><del>- return lh.value();
</del><ins>+ return clampTo<int>(lh.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderStyle::setWordSpacing(Length value)
</span></span></pre>
</div>
</div>
</body>
</html>