<!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>[198129] 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/198129">198129</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-03-14 08:19:12 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make MathML colspan/rowspan consistent with HTML table cells.
https://bugs.webkit.org/show_bug.cgi?id=150253
Patch by Frederic Wang <fwang@igalia.com> on 2016-03-14
Reviewed by Martin Robinson.
Source/WebCore:
Test: mathml/rowspan-crash.xhtml
We make MathMLElement::colSpan and MathMLElement::rowSpan consistent with the corresponding functions in HTMLTableCellElement.cpp.
These functions now return unsigned integers, use the same parsing functions and set a maximum for rowspan.
This latter change fixes crash/timeout with large values of rowspan.
* mathml/MathMLElement.cpp: Include HTMLParserIdioms to use limitToOnlyHTMLNonNegative.
(WebCore::MathMLElement::colSpan): Use unsigned integer and limitToOnlyHTMLNonNegative.
(WebCore::MathMLElement::rowSpan): ditto. We also use the same maximum limit as HTMLTableCellElement.
* mathml/MathMLElement.h: Make colSpan and rowSpan return unsigned integers.
LayoutTests:
We import crashing test from bug 150253.
* mathml/rowspan-crash-expected.txt: Added.
* mathml/rowspan-crash.xhtml: 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="#trunkSourceWebCoremathmlMathMLElementcpp">trunk/Source/WebCore/mathml/MathMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmathmlrowspancrashexpectedtxt">trunk/LayoutTests/mathml/rowspan-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmathmlrowspancrashxhtml">trunk/LayoutTests/mathml/rowspan-crash.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198128 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-14 15:17:06 UTC (rev 198128)
+++ trunk/LayoutTests/ChangeLog 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Frederic Wang <fwang@igalia.com>
+
+ Make MathML colspan/rowspan consistent with HTML table cells.
+ https://bugs.webkit.org/show_bug.cgi?id=150253
+
+ Reviewed by Martin Robinson.
+
+ We import crashing test from bug 150253.
+
+ * mathml/rowspan-crash-expected.txt: Added.
+ * mathml/rowspan-crash.xhtml: Added.
+
</ins><span class="cx"> 2016-03-14 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Continue work on https://bugs.webkit.org/show_bug.cgi?id=106350
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlrowspancrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/rowspan-crash-expected.txt (0 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/rowspan-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/mathml/rowspan-crash-expected.txt 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test shouldn't crash.
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/mathml/rowspan-crash-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmathmlrowspancrashxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/rowspan-crash.xhtml (0 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/rowspan-crash.xhtml (rev 0)
+++ trunk/LayoutTests/mathml/rowspan-crash.xhtml 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<p>This test shouldn't crash.</p>
+<mtd xmlns="http://www.w3.org/1998/Math/MathML" id="mtd" rowspan="1073741825"/>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198128 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-14 15:17:06 UTC (rev 198128)
+++ trunk/Source/WebCore/ChangeLog 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-14 Frederic Wang <fwang@igalia.com>
+
+ Make MathML colspan/rowspan consistent with HTML table cells.
+ https://bugs.webkit.org/show_bug.cgi?id=150253
+
+ Reviewed by Martin Robinson.
+
+ Test: mathml/rowspan-crash.xhtml
+
+ We make MathMLElement::colSpan and MathMLElement::rowSpan consistent with the corresponding functions in HTMLTableCellElement.cpp.
+ These functions now return unsigned integers, use the same parsing functions and set a maximum for rowspan.
+ This latter change fixes crash/timeout with large values of rowspan.
+
+ * mathml/MathMLElement.cpp: Include HTMLParserIdioms to use limitToOnlyHTMLNonNegative.
+ (WebCore::MathMLElement::colSpan): Use unsigned integer and limitToOnlyHTMLNonNegative.
+ (WebCore::MathMLElement::rowSpan): ditto. We also use the same maximum limit as HTMLTableCellElement.
+ * mathml/MathMLElement.h: Make colSpan and rowSpan return unsigned integers.
+
</ins><span class="cx"> 2016-03-14 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> Enable GSS-Negotiate support in libsoup
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (198128 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-03-14 15:17:06 UTC (rev 198128)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "HTMLMapElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "HTMLParserIdioms.h"
</ins><span class="cx"> #include "MathMLNames.h"
</span><span class="cx"> #include "MathMLSelectElement.h"
</span><span class="cx"> #include "RenderTableCell.h"
</span><span class="lines">@@ -193,20 +194,21 @@
</span><span class="cx"> || htmlElement.hasTagName(HTMLNames::ulTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int MathMLElement::colSpan() const
</del><ins>+unsigned MathMLElement::colSpan() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasTagName(mtdTag))
</span><del>- return 1;
</del><ins>+ return 1u;
</ins><span class="cx"> const AtomicString& colSpanValue = fastGetAttribute(columnspanAttr);
</span><del>- return std::max(1, colSpanValue.toInt());
</del><ins>+ return std::max(1u, limitToOnlyHTMLNonNegative(colSpanValue, 1u));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-int MathMLElement::rowSpan() const
</del><ins>+unsigned MathMLElement::rowSpan() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasTagName(mtdTag))
</span><del>- return 1;
</del><ins>+ return 1u;
</ins><span class="cx"> const AtomicString& rowSpanValue = fastGetAttribute(rowspanAttr);
</span><del>- return std::max(1, rowSpanValue.toInt());
</del><ins>+ static const unsigned maxRowspan = 8190; // This constant comes from HTMLTableCellElement.
+ return std::max(1u, std::min(limitToOnlyHTMLNonNegative(rowSpanValue, 1u), maxRowspan));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MathMLElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (198128 => 198129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2016-03-14 15:17:06 UTC (rev 198128)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2016-03-14 15:19:12 UTC (rev 198129)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx">
</span><del>- int colSpan() const;
- int rowSpan() const;
</del><ins>+ unsigned colSpan() const;
+ unsigned rowSpan() const;
</ins><span class="cx">
</span><span class="cx"> bool isMathMLToken() const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>