<!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>[176170] trunk</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/176170">176170</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-16 21:38:05 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assertion hit when setting a very large value to 'border-width' / 'font-size' CSS properties
https://bugs.webkit.org/show_bug.cgi?id=138770
Reviewed by Darin Adler.
Source/WebCore:
When setting a very large value to a CSS property, it is represented internally as
infinity. <a href="http://trac.webkit.org/projects/webkit/changeset/166114">r166114</a> already tried to deal with this by adding an std::isinf() check
in CSSValuePool::createValue() and returning an identifier CSSPrimitiveValue with
CSSValueInvalid value in such case. The issue is that doing leads to the
StyleBuilder getting a CSSValueInvalid CSSPrimitive value as input, which is not
handled and leads to assertions.
This patch updates the CSSParser to detect cases where the double value is
infinity earlier (in CSSParser::validUnit() and parseSimpleLengthValue()), so
that we mark the value as invalid and actually drop it. As a result,
CSSPrimitiveValues with CSSValueInvalid value no longer make their way to the
StyleBuilder.
Test: fast/css/style-builder-infinite-value.html
fast/css/infinite-floating-value.html
* css/CSSParser.cpp:
(WebCore::parseSimpleLengthValue):
(WebCore::CSSParser::validUnit):
* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::createValue):
LayoutTests:
Add a layout test setting very large values to 'border-width' and
'font-size' CSS properties.
* fast/css/style-builder-infinite-value-expected.txt: Added.
* fast/css/style-builder-infinite-value.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolcpp">trunk/Source/WebCore/css/CSSValuePool.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssstylebuilderinfinitevalueexpectedtxt">trunk/LayoutTests/fast/css/style-builder-infinite-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstylebuilderinfinitevaluehtml">trunk/LayoutTests/fast/css/style-builder-infinite-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176169 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-17 05:14:47 UTC (rev 176169)
+++ trunk/LayoutTests/ChangeLog 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-11-16 Chris Dumez <cdumez@apple.com>
+
+ Assertion hit when setting a very large value to 'border-width' / 'font-size' CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=138770
+
+ Reviewed by Darin Adler.
+
+ Add a layout test setting very large values to 'border-width' and
+ 'font-size' CSS properties.
+
+ * fast/css/style-builder-infinite-value-expected.txt: Added.
+ * fast/css/style-builder-infinite-value.html: Added.
+
</ins><span class="cx"> 2014-11-16 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Attribute text in HTMLAnchorElement should behave as per specification.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssstylebuilderinfinitevalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-builder-infinite-value-expected.txt (0 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-builder-infinite-value-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/style-builder-infinite-value-expected.txt 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Tests setting a very large value to several CSS properties.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testDiv.style['border-width'] is "1px"
+PASS testDiv.style['border-width'] is "1px"
+PASS testDiv.style['font-size'] is "1em"
+PASS testDiv.style['font-size'] is "1em"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+This test passes if it does not crash.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstylebuilderinfinitevaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-builder-infinite-value.html (0 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-builder-infinite-value.html (rev 0)
+++ trunk/LayoutTests/fast/css/style-builder-infinite-value.html 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../resources/js-test-pre.js"></script>
+<body>
+<p>This test passes if it does not crash.</p>
+
+<div id="testDiv"></div>
+
+<script>
+description("Tests setting a very large value to several CSS properties.");
+
+var testDiv = document.getElementById("testDiv");
+testDiv.style["border-width"] = "1px";
+shouldBeEqualToString("testDiv.style['border-width']", "1px");
+testDiv.style["border-width"] = "900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000px";
+shouldBeEqualToString("testDiv.style['border-width']", "1px");
+
+testDiv.style["font-size"] = "1em";
+shouldBeEqualToString("testDiv.style['font-size']", "1em");
+testDiv.style["font-size"] = "900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000%";
+shouldBeEqualToString("testDiv.style['font-size']", "1em");
+</script>
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176169 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-17 05:14:47 UTC (rev 176169)
+++ trunk/Source/WebCore/ChangeLog 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-16 Chris Dumez <cdumez@apple.com>
+
+ Assertion hit when setting a very large value to 'border-width' / 'font-size' CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=138770
+
+ Reviewed by Darin Adler.
+
+ When setting a very large value to a CSS property, it is represented internally as
+ infinity. r166114 already tried to deal with this by adding an std::isinf() check
+ in CSSValuePool::createValue() and returning an identifier CSSPrimitiveValue with
+ CSSValueInvalid value in such case. The issue is that doing leads to the
+ StyleBuilder getting a CSSValueInvalid CSSPrimitive value as input, which is not
+ handled and leads to assertions.
+
+ This patch updates the CSSParser to detect cases where the double value is
+ infinity earlier (in CSSParser::validUnit() and parseSimpleLengthValue()), so
+ that we mark the value as invalid and actually drop it. As a result,
+ CSSPrimitiveValues with CSSValueInvalid value no longer make their way to the
+ StyleBuilder.
+
+ Test: fast/css/style-builder-infinite-value.html
+ fast/css/infinite-floating-value.html
+
+ * css/CSSParser.cpp:
+ (WebCore::parseSimpleLengthValue):
+ (WebCore::CSSParser::validUnit):
+ * css/CSSValuePool.cpp:
+ (WebCore::CSSValuePool::createValue):
+
</ins><span class="cx"> 2014-11-16 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Attribute text in HTMLAnchorElement should behave as per specification.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (176169 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-17 05:14:47 UTC (rev 176169)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -626,6 +626,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (number < 0 && !acceptsNegativeNumbers)
</span><span class="cx"> return false;
</span><ins>+ if (std::isinf(number))
+ return false;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> value = cssValuePool().createValue(number, unit);
</span><span class="cx"> declaration->addParsedProperty(CSSProperty(propertyId, value.release(), important));
</span><span class="lines">@@ -1696,6 +1698,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (b && unitflags & FNonNeg && value->fValue < 0)
</span><span class="cx"> b = false;
</span><ins>+ if (b && std::isinf(value->fValue))
+ b = false;
</ins><span class="cx"> return b;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (176169 => 176170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.cpp 2014-11-17 05:14:47 UTC (rev 176169)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp 2014-11-17 05:38:05 UTC (rev 176170)
</span><span class="lines">@@ -89,8 +89,7 @@
</span><span class="cx">
</span><span class="cx"> PassRef<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitTypes type)
</span><span class="cx"> {
</span><del>- if (std::isinf(value))
- return createIdentifierValue(CSSValueID::CSSValueInvalid);
</del><ins>+ ASSERT(std::isfinite(value));
</ins><span class="cx">
</span><span class="cx"> if (value < 0 || value > maximumCacheableIntegerValue)
</span><span class="cx"> return CSSPrimitiveValue::create(value, type);
</span></span></pre>
</div>
</div>
</body>
</html>