<!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>[168000] releases/WebKitGTK/webkit-2.2</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/168000">168000</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-30 02:33:15 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/165138">r165138</a> - Fix crash in CompositeEditCommand::cloneParagraphUnderNewElement()
<http://webkit.org/b/129751>
<rdar://problem/16237965>
Reviewed by Jon Honeycutt.
Merged from Blink (patch by Yuta Kitamura):
https://src.chromium.org/viewvc/blink?revision=168160&view=revision
http://crbug.com/345005
The root cause is CompositeEditCommand::moveParagraphWithClones() passing
two positions |start| and |end| which do not follow the document order,
i.e. in some situations |start| is located after |end| because of
the difference in affinity.
This patch fixes this crash by normalizing |end| to |start| in such situations.
It also adds an ASSERT that checks the relationship between |start| and |end|.
Source/WebCore:
Test: editing/execCommand/format-block-crash.html
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
(WebCore::CompositeEditCommand::moveParagraphWithClones):
* editing/CompositeEditCommand.h:
LayoutTests:
* editing/execCommand/format-block-crash-expected.txt: Added.
* editing/execCommand/format-block-crash.html: Added.
* editing/execCommand/resources/format-block-crash-iframe.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreeditingCompositeEditCommandcpp">releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreeditingCompositeEditCommandh">releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestseditingexecCommandformatblockcrashexpectedtxt">releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestseditingexecCommandformatblockcrashhtml">releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash.html</a></li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestseditingexecCommandresourcesformatblockcrashiframehtml">releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/resources/format-block-crash-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog (167999 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-04-30 09:30:11 UTC (rev 167999)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-05 David Kilzer <ddkilzer@apple.com>
+
+ Fix crash in CompositeEditCommand::cloneParagraphUnderNewElement()
+ <http://webkit.org/b/129751>
+ <rdar://problem/16237965>
+
+ Reviewed by Jon Honeycutt.
+
+ Merged from Blink (patch by Yuta Kitamura):
+ https://src.chromium.org/viewvc/blink?revision=168160&view=revision
+ http://crbug.com/345005
+
+ The root cause is CompositeEditCommand::moveParagraphWithClones() passing
+ two positions |start| and |end| which do not follow the document order,
+ i.e. in some situations |start| is located after |end| because of
+ the difference in affinity.
+
+ This patch fixes this crash by normalizing |end| to |start| in such situations.
+ It also adds an ASSERT that checks the relationship between |start| and |end|.
+
+ * editing/execCommand/format-block-crash-expected.txt: Added.
+ * editing/execCommand/format-block-crash.html: Added.
+ * editing/execCommand/resources/format-block-crash-iframe.html: Added.
+
</ins><span class="cx"> 2014-03-01 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure keySplines is valid in SMIL animations
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestseditingexecCommandformatblockcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash-expected.txt (0 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash-expected.txt 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Should not crash if we load a test case from crbug.com/345005.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS event.data is "FINISH"
+PASS Did not crash.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestseditingexecCommandformatblockcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash.html (0 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/format-block-crash.html 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>FormatBlock crash</title>
+<script src="../../resources/js-test.js"></script>
+</head>
+<body>
+<script>
+description('Should not crash if we load a test case from crbug.com/345005.');
+
+window.jsTestIsAsync = true;
+
+window.addEventListener('message', didReceiveMessage, false);
+
+var iframe = document.createElement('iframe');
+iframe.src = 'resources/format-block-crash-iframe.html';
+document.body.appendChild(iframe);
+
+function didReceiveMessage(event)
+{
+ shouldBeEqualToString('event.data', 'FINISH');
+ document.body.removeChild(iframe);
+ testPassed('Did not crash.');
+ window.finishJSTest();
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestseditingexecCommandresourcesformatblockcrashiframehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/resources/format-block-crash-iframe.html (0 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/resources/format-block-crash-iframe.html (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/editing/execCommand/resources/format-block-crash-iframe.html 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>FormatBlock crash test case</title>
+</head>
+<!-- This is a minified version of the clusterfuzz test case at https://code.google.com/p/chromium/issues/detail?id=345005 -->
+<body style="display: table-row;">
+<script>
+function run()
+{
+ document.designMode = 'on';
+ document.execCommand('SelectAll');
+ document.execCommand('FormatBlock', false, '<' + 'div>');
+ window.setTimeout(notifyFinish, 0);
+}
+
+function notifyFinish()
+{
+ window.parent.postMessage('FINISH', '*');
+}
+
+window.setTimeout(run, 0);
+</script>
+<span contenteditable="true" style="display: table-caption;"></span>
+<span></span>
+<div style="display: -webkit-inline-box;"><span><span>B</span></span></div>
+<div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (167999 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2014-04-30 09:30:11 UTC (rev 167999)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-03-05 David Kilzer <ddkilzer@apple.com>
+
+ Fix crash in CompositeEditCommand::cloneParagraphUnderNewElement()
+ <http://webkit.org/b/129751>
+ <rdar://problem/16237965>
+
+ Reviewed by Jon Honeycutt.
+
+ Merged from Blink (patch by Yuta Kitamura):
+ https://src.chromium.org/viewvc/blink?revision=168160&view=revision
+ http://crbug.com/345005
+
+ The root cause is CompositeEditCommand::moveParagraphWithClones() passing
+ two positions |start| and |end| which do not follow the document order,
+ i.e. in some situations |start| is located after |end| because of
+ the difference in affinity.
+
+ This patch fixes this crash by normalizing |end| to |start| in such situations.
+ It also adds an ASSERT that checks the relationship between |start| and |end|.
+
+ Test: editing/execCommand/format-block-crash.html
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
+ (WebCore::CompositeEditCommand::moveParagraphWithClones):
+ * editing/CompositeEditCommand.h:
+
</ins><span class="cx"> 2014-03-01 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure keySplines is valid in SMIL animations
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.cpp (167999 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.cpp 2014-04-30 09:30:11 UTC (rev 167999)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.cpp 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -991,8 +991,10 @@
</span><span class="cx"> // Clone the paragraph between start and end under blockElement,
</span><span class="cx"> // preserving the hierarchy up to outerNode.
</span><span class="cx">
</span><del>-void CompositeEditCommand::cloneParagraphUnderNewElement(Position& start, Position& end, Node* passedOuterNode, Element* blockElement)
</del><ins>+void CompositeEditCommand::cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* passedOuterNode, Element* blockElement)
</ins><span class="cx"> {
</span><ins>+ ASSERT(comparePositions(start, end) <= 0);
+
</ins><span class="cx"> // First we clone the outerNode
</span><span class="cx"> RefPtr<Node> lastNode;
</span><span class="cx"> RefPtr<Node> outerNode = passedOuterNode;
</span><span class="lines">@@ -1110,7 +1112,7 @@
</span><span class="cx"> // We upstream() the end and downstream() the start so that we don't include collapsed whitespace in the move.
</span><span class="cx"> // When we paste a fragment, spaces after the end and before the start are treated as though they were rendered.
</span><span class="cx"> Position start = startOfParagraphToMove.deepEquivalent().downstream();
</span><del>- Position end = endOfParagraphToMove.deepEquivalent().upstream();
</del><ins>+ Position end = startOfParagraphToMove == endOfParagraphToMove ? start : endOfParagraphToMove.deepEquivalent().upstream();
</ins><span class="cx">
</span><span class="cx"> cloneParagraphUnderNewElement(start, end, outerNode, blockElement);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.h (167999 => 168000)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.h 2014-04-30 09:30:11 UTC (rev 167999)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/editing/CompositeEditCommand.h 2014-04-30 09:33:15 UTC (rev 168000)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> void moveParagraph(const VisiblePosition&, const VisiblePosition&, const VisiblePosition&, bool preserveSelection = false, bool preserveStyle = true);
</span><span class="cx"> void moveParagraphs(const VisiblePosition&, const VisiblePosition&, const VisiblePosition&, bool preserveSelection = false, bool preserveStyle = true);
</span><span class="cx"> void moveParagraphWithClones(const VisiblePosition& startOfParagraphToMove, const VisiblePosition& endOfParagraphToMove, Element* blockElement, Node* outerNode);
</span><del>- void cloneParagraphUnderNewElement(Position& start, Position& end, Node* outerNode, Element* blockElement);
</del><ins>+ void cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* outerNode, Element* blockElement);
</ins><span class="cx"> void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition());
</span><span class="cx">
</span><span class="cx"> bool breakOutOfEmptyListItem();
</span></span></pre>
</div>
</div>
</body>
</html>