<!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>[177089] 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/177089">177089</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 12:46:15 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when creating CSSCalcBinaryOperation
https://bugs.webkit.org/show_bug.cgi?id=134886
rdar://problem/17663561
Reviewed by Chris Dumez.
Source/WebCore:
Test: fast/css/calc-binary-operation-crash.html
* css/CSSCalculationValue.cpp:
(WebCore::determineCategory):
Ensure that both axis are within the addSubtractResult table.
Remove unneeded CalcOther test. The call site guarantees it doesn't happen and the normal cases would handle it anyway.
Also strengthen some asserts.
LayoutTests:
* fast/css/calc-binary-operation-crash-expected.txt: Added.
* fast/css/calc-binary-operation-crash.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="#trunkSourceWebCorecssCSSCalculationValuecpp">trunk/Source/WebCore/css/CSSCalculationValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsscalcbinaryoperationcrashexpectedtxt">trunk/LayoutTests/fast/css/calc-binary-operation-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscalcbinaryoperationcrashhtml">trunk/LayoutTests/fast/css/calc-binary-operation-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177088 => 177089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-10 20:43:18 UTC (rev 177088)
+++ trunk/LayoutTests/ChangeLog 2014-12-10 20:46:15 UTC (rev 177089)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-10 Antti Koivisto <antti@apple.com>
+
+ Crash when creating CSSCalcBinaryOperation
+ https://bugs.webkit.org/show_bug.cgi?id=134886
+ rdar://problem/17663561
+
+ Reviewed by Chris Dumez.
+
+ * fast/css/calc-binary-operation-crash-expected.txt: Added.
+ * fast/css/calc-binary-operation-crash.html: Added.
+
</ins><span class="cx"> 2014-12-10 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] MathML tokens with text fail to expose their text content via AtkText
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscalcbinaryoperationcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/calc-binary-operation-crash-expected.txt (0 => 177089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/calc-binary-operation-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/calc-binary-operation-crash-expected.txt 2014-12-10 20:46:15 UTC (rev 177089)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test passes if it doesn't crash.
+
+X
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsscalcbinaryoperationcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/calc-binary-operation-crash.html (0 => 177089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/calc-binary-operation-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css/calc-binary-operation-crash.html 2014-12-10 20:46:15 UTC (rev 177089)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>This test passes if it doesn't crash.</p>
+<p style="text-indent: calc(25s - 3px + 12.5%*2)">X</p>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177088 => 177089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-10 20:43:18 UTC (rev 177088)
+++ trunk/Source/WebCore/ChangeLog 2014-12-10 20:46:15 UTC (rev 177089)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-10 Antti Koivisto <antti@apple.com>
+
+ Crash when creating CSSCalcBinaryOperation
+ https://bugs.webkit.org/show_bug.cgi?id=134886
+ rdar://problem/17663561
+
+ Reviewed by Chris Dumez.
+
+ Test: fast/css/calc-binary-operation-crash.html
+
+ * css/CSSCalculationValue.cpp:
+ (WebCore::determineCategory):
+
+ Ensure that both axis are within the addSubtractResult table.
+ Remove unneeded CalcOther test. The call site guarantees it doesn't happen and the normal cases would handle it anyway.
+ Also strengthen some asserts.
+
</ins><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WebStorageNamespaceProvider::closeLocalStorage
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (177088 => 177089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2014-12-10 20:43:18 UTC (rev 177088)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2014-12-10 20:46:15 UTC (rev 177089)
</span><span class="lines">@@ -242,6 +242,7 @@
</span><span class="cx"> case CalcOther:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -311,14 +312,13 @@
</span><span class="cx"> {
</span><span class="cx"> CalculationCategory leftCategory = leftSide.category();
</span><span class="cx"> CalculationCategory rightCategory = rightSide.category();
</span><ins>+ ASSERT(leftCategory < CalcOther);
+ ASSERT(rightCategory < CalcOther);
</ins><span class="cx">
</span><del>- if (leftCategory == CalcOther || rightCategory == CalcOther)
- return CalcOther;
-
</del><span class="cx"> switch (op) {
</span><span class="cx"> case CalcAdd:
</span><span class="cx"> case CalcSubtract:
</span><del>- if (leftCategory < CalcAngle || rightCategory < CalcAngle)
</del><ins>+ if (leftCategory < CalcAngle && rightCategory < CalcAngle)
</ins><span class="cx"> return addSubtractResult[leftCategory][rightCategory];
</span><span class="cx"> if (leftCategory == rightCategory)
</span><span class="cx"> return leftCategory;
</span><span class="lines">@@ -349,7 +349,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSCalcBinaryOperation> create(CalcOperator op, PassRefPtr<CSSCalcExpressionNode> leftSide, PassRefPtr<CSSCalcExpressionNode> rightSide)
</span><span class="cx"> {
</span><del>- ASSERT(leftSide->category() != CalcOther && rightSide->category() != CalcOther);
</del><ins>+ ASSERT(leftSide->category() < CalcOther);
+ ASSERT(rightSide->category() < CalcOther);
</ins><span class="cx">
</span><span class="cx"> CalculationCategory newCategory = determineCategory(*leftSide, *rightSide, op);
</span><span class="cx">
</span><span class="lines">@@ -363,7 +364,8 @@
</span><span class="cx"> {
</span><span class="cx"> CalculationCategory leftCategory = leftSide->category();
</span><span class="cx"> CalculationCategory rightCategory = rightSide->category();
</span><del>- ASSERT(leftCategory != CalcOther && rightCategory != CalcOther);
</del><ins>+ ASSERT(leftCategory < CalcOther);
+ ASSERT(rightCategory < CalcOther);
</ins><span class="cx">
</span><span class="cx"> bool isInteger = isIntegerResult(op, *leftSide, *rightSide);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>