<!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>[190634] 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/190634">190634</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-06 12:48:24 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix crash in ApplyStyleCommand::applyRelativeFontStyleChange()
https://bugs.webkit.org/show_bug.cgi?id=149300
<rdar://problem/22747046>
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-06
Reviewed by Chris Dumez.
Source/WebCore:
This is a merge of Blink <a href="http://trac.webkit.org/projects/webkit/changeset/167845">r167845</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/194944">r194944</a>:
https://codereview.chromium.org/177093016
https://codereview.chromium.org/1124863003
Test: editing/style/apply-style-crash2.html
editing/style/apply-style-crash3.html
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
The issue was that we would traverse the DOM tree past the beyondEnd
under some circumstances and thus NodeTraversal::next() would return
null unexpectedly. This CL adds a check to make sure startNode != beyondEnd
before traversing to avoid the problem.
Besides that, this CL hardens changing font style over unknown elements.
When adjusting the start node position of where to apply a font style
command, check that we haven't stepped off the end.
This CL also adds a few more assertions to catch similar issues
more easily in the future.
LayoutTests:
* editing/style/apply-style-crash2-expected.txt: Added.
* editing/style/apply-style-crash2.html: Added.
* editing/style/apply-style-crash3-expected.txt: Added.
* editing/style/apply-style-crash3.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="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingstyleapplystylecrash2expectedtxt">trunk/LayoutTests/editing/style/apply-style-crash2-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingstyleapplystylecrash2html">trunk/LayoutTests/editing/style/apply-style-crash2.html</a></li>
<li><a href="#trunkLayoutTestseditingstyleapplystylecrash3expectedtxt">trunk/LayoutTests/editing/style/apply-style-crash3-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingstyleapplystylecrash3html">trunk/LayoutTests/editing/style/apply-style-crash3.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190633 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-10-06 19:23:52 UTC (rev 190633)
+++ trunk/LayoutTests/ChangeLog        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-06 Jiewen Tan <jiewen_tan@apple.com>
+
+ Fix crash in ApplyStyleCommand::applyRelativeFontStyleChange()
+ https://bugs.webkit.org/show_bug.cgi?id=149300
+ <rdar://problem/22747046>
+
+ Reviewed by Chris Dumez.
+
+ * editing/style/apply-style-crash2-expected.txt: Added.
+ * editing/style/apply-style-crash2.html: Added.
+ * editing/style/apply-style-crash3-expected.txt: Added.
+ * editing/style/apply-style-crash3.html: Added.
+
</ins><span class="cx"> 2015-10-06 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Don't need to reset auto-margins during grid items layout
</span></span></pre></div>
<a id="trunkLayoutTestseditingstyleapplystylecrash2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/apply-style-crash2-expected.txt (0 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/apply-style-crash2-expected.txt         (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-crash2-expected.txt        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if it does not crash.
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestseditingstyleapplystylecrash2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/apply-style-crash2.html (0 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/apply-style-crash2.html         (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-crash2.html        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+This test passes if it does not crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+el1 = document.createElement('li');
+document.body.appendChild(el1);
+el2 = document.createElement('thead');
+el1.appendChild(el2);
+el2.parentNode.insertBefore(document.createElement('video'), el2);
+el2.parentNode.insertBefore(document.createElement('input'), el2);
+document.designMode = 'on';
+window.getSelection().setBaseAndExtent(el1, 2, el2, 4);
+document.designMode = 'off';
+window.getSelection().modify('extend', 'backward', 'character');
+el1.innerHTML = "PASS";
+document.designMode = 'on';
+document.execCommand('FontSizeDelta', false, '-1px');
+document.designMode = 'off';
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingstyleapplystylecrash3expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/apply-style-crash3-expected.txt (0 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/apply-style-crash3-expected.txt         (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-crash3-expected.txt        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Verify that changing the style over an unknown element does not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingstyleapplystylecrash3html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/apply-style-crash3.html (0 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/apply-style-crash3.html         (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-crash3.html        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+</head>
+<body>
+<unknown>
+<script></script>
+<textarea></textarea>
+<script>
+function onDOMNodeRemoved(e) {
+ if (!(e.srcElement instanceof Element))
+ return;
+
+ e.srcElement.insertAdjacentHTML('afterbegin', ' ');
+ document.execCommand('FontSizeDelta', false, '1px');
+}
+
+document.addEventListener("DOMNodeRemoved", onDOMNodeRemoved, false);
+document.designMode = "on";
+document.execCommand("SelectAll", false)
+var unknown = document.getElementsByTagName("unknown")[0];
+unknown.textContent = "sss";
+unknown.outerHTML = "";
+document.execCommand("SelectAll", false);
+// Put description() here so as to not upset test condition.
+description("Verify that changing the style over an unknown element does not crash.");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190633 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-06 19:23:52 UTC (rev 190633)
+++ trunk/Source/WebCore/ChangeLog        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-06 Jiewen Tan <jiewen_tan@apple.com>
+
+ Fix crash in ApplyStyleCommand::applyRelativeFontStyleChange()
+ https://bugs.webkit.org/show_bug.cgi?id=149300
+ <rdar://problem/22747046>
+
+ Reviewed by Chris Dumez.
+
+ This is a merge of Blink r167845 and r194944:
+ https://codereview.chromium.org/177093016
+ https://codereview.chromium.org/1124863003
+
+ Test: editing/style/apply-style-crash2.html
+ editing/style/apply-style-crash3.html
+
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
+ The issue was that we would traverse the DOM tree past the beyondEnd
+ under some circumstances and thus NodeTraversal::next() would return
+ null unexpectedly. This CL adds a check to make sure startNode != beyondEnd
+ before traversing to avoid the problem.
+
+ Besides that, this CL hardens changing font style over unknown elements.
+ When adjusting the start node position of where to apply a font style
+ command, check that we haven't stepped off the end.
+
+ This CL also adds a few more assertions to catch similar issues
+ more easily in the future.
+
</ins><span class="cx"> 2015-10-06 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Don't need to reset auto-margins during grid items layout
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (190633 => 190634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp        2015-10-06 19:23:52 UTC (rev 190633)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp        2015-10-06 19:48:24 UTC (rev 190634)
</span><span class="lines">@@ -348,7 +348,9 @@
</span><span class="cx"> // Calculate loop end point.
</span><span class="cx"> // If the end node is before the start node (can only happen if the end node is
</span><span class="cx"> // an ancestor of the start node), we gather nodes up to the next sibling of the end node
</span><del>- Node *beyondEnd;
</del><ins>+ Node* beyondEnd;
+ ASSERT(start.deprecatedNode());
+ ASSERT(end.deprecatedNode());
</ins><span class="cx"> if (start.deprecatedNode()->isDescendantOf(end.deprecatedNode()))
</span><span class="cx"> beyondEnd = NodeTraversal::nextSkippingChildren(*end.deprecatedNode());
</span><span class="cx"> else
</span><span class="lines">@@ -356,20 +358,33 @@
</span><span class="cx">
</span><span class="cx"> start = start.upstream(); // Move upstream to ensure we do not add redundant spans.
</span><span class="cx"> Node* startNode = start.deprecatedNode();
</span><del>- if (startNode->isTextNode() && start.deprecatedEditingOffset() >= caretMaxOffset(startNode)) // Move out of text node if range does not include its characters.
</del><ins>+
+ // Make sure we're not already at the end or the next NodeTraversal::next() will traverse
+ // past it.
+ if (startNode == beyondEnd)
+ return;
+
+ if (startNode->isTextNode() && start.deprecatedEditingOffset() >= caretMaxOffset(startNode)) {
+ // Move out of text node if range does not include its characters.
</ins><span class="cx"> startNode = NodeTraversal::next(*startNode);
</span><ins>+ if (!startNode)
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> // Store away font size before making any changes to the document.
</span><span class="cx"> // This ensures that changes to one node won't effect another.
</span><span class="cx"> HashMap<Node*, float> startingFontSizes;
</span><del>- for (Node *node = startNode; node != beyondEnd; node = NodeTraversal::next(*node))
</del><ins>+ for (Node* node = startNode; node != beyondEnd; node = NodeTraversal::next(*node)) {
+ ASSERT(node);
</ins><span class="cx"> startingFontSizes.set(node, computedFontSize(node));
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // These spans were added by us. If empty after font size changes, they can be removed.
</span><span class="cx"> Vector<RefPtr<HTMLElement>> unstyledSpans;
</span><span class="cx">
</span><del>- Node* lastStyledNode = 0;
</del><ins>+ Node* lastStyledNode = nullptr;
</ins><span class="cx"> for (Node* node = startNode; node != beyondEnd; node = NodeTraversal::next(*node)) {
</span><ins>+ ASSERT(node);
</ins><span class="cx"> RefPtr<HTMLElement> element;
</span><span class="cx"> if (is<HTMLElement>(*node)) {
</span><span class="cx"> // Only work on fully selected nodes.
</span></span></pre>
</div>
</div>
</body>
</html>