<!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>[195024] releases/WebKitGTK/webkit-2.10</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/195024">195024</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-14 03:14:30 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192477">r192477</a> - Null-pointer dereference in WebCore::firstEditablePositionAfterPositionInRoot
https://bugs.webkit.org/show_bug.cgi?id=151288
<rdar://problem/23450367>
Reviewed by Darin Adler.
Source/WebCore:
Some problematic organization of body element could cause problems to JustifyRight
and Indent commnads.
Tests: editing/execCommand/justify-right-then-indent-with-problematic-body.html
editing/execCommand/justify-right-with-problematic-body.html
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::moveParagraphContentsToNewBlockIfNecessary):
Assertion at l1017 is not held anymore with the testcase:
editing/execCommand/justify-right-with-problematic-body.html.
Therefore, change it to an if statement.
Also, add a guardance before calling insertNewDefaultParagraphElementAt()
as insertNodeAt() requires an editable position.
(WebCore::CompositeEditCommand::moveParagraphWithClones):
Add a guardance before calling insertNodeAt() as it requires an editable position.
* editing/htmlediting.cpp:
(WebCore::firstEditablePositionAfterPositionInRoot):
(WebCore::lastEditablePositionBeforePositionInRoot):
LayoutTests:
* editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt: Added.
* editing/execCommand/justify-right-then-indent-with-problematic-body.html: Added.
* editing/execCommand/justify-right-with-problematic-body-expected.txt: Added.
* editing/execCommand/justify-right-with-problematic-body.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreeditingCompositeEditCommandcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreeditinghtmleditingcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/htmlediting.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightwithproblematicbodyexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightwithproblematicbodyhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195023 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-14 11:11:35 UTC (rev 195023)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-16 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null-pointer dereference in WebCore::firstEditablePositionAfterPositionInRoot
+ https://bugs.webkit.org/show_bug.cgi?id=151288
+ <rdar://problem/23450367>
+
+ Reviewed by Darin Adler.
+
+ * editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt: Added.
+ * editing/execCommand/justify-right-then-indent-with-problematic-body.html: Added.
+ * editing/execCommand/justify-right-with-problematic-body-expected.txt: Added.
+ * editing/execCommand/justify-right-with-problematic-body.html: Added.
+
</ins><span class="cx"> 2015-11-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Always render at least a device pixel line when border/outline width > 0.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (0 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Pass.
+WebKit didn't Crash.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightthenindentwithproblematicbodyhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body.html (0 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body.html 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body id="webtest3">
+Pass. <summary/>WebKit didn't Crash.<br>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function editingTest() {
+ document.execCommand("SelectAll");
+ document.designMode = "on";
+ document.execCommand("JustifyRight", false, null);
+ document.execCommand("Indent", false, null);
+}
+editingTest();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightwithproblematicbodyexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body-expected.txt (0 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body-expected.txt 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Pass. WebKit didn't crash.
+
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandjustifyrightwithproblematicbodyhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body.html (0 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/justify-right-with-problematic-body.html 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+Pass. WebKit didn't crash.<ul><br><summary>
+<br><rt/>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function editingTest() {
+ document.execCommand("SelectAll");
+ document.designMode = "on";
+ document.execCommand("JustifyRight", true, "Arial");
+}
+editingTest();
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195023 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-14 11:11:35 UTC (rev 195023)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-11-16 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null-pointer dereference in WebCore::firstEditablePositionAfterPositionInRoot
+ https://bugs.webkit.org/show_bug.cgi?id=151288
+ <rdar://problem/23450367>
+
+ Reviewed by Darin Adler.
+
+ Some problematic organization of body element could cause problems to JustifyRight
+ and Indent commnads.
+
+ Tests: editing/execCommand/justify-right-then-indent-with-problematic-body.html
+ editing/execCommand/justify-right-with-problematic-body.html
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::moveParagraphContentsToNewBlockIfNecessary):
+ Assertion at l1017 is not held anymore with the testcase:
+ editing/execCommand/justify-right-with-problematic-body.html.
+ Therefore, change it to an if statement.
+ Also, add a guardance before calling insertNewDefaultParagraphElementAt()
+ as insertNodeAt() requires an editable position.
+ (WebCore::CompositeEditCommand::moveParagraphWithClones):
+ Add a guardance before calling insertNodeAt() as it requires an editable position.
+ * editing/htmlediting.cpp:
+ (WebCore::firstEditablePositionAfterPositionInRoot):
+ (WebCore::lastEditablePositionBeforePositionInRoot):
+
</ins><span class="cx"> 2015-11-14 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r188820): Downloads of data URLs is broken
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/CompositeEditCommand.cpp (195023 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/CompositeEditCommand.cpp 2016-01-14 11:11:35 UTC (rev 195023)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/CompositeEditCommand.cpp 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -1014,16 +1014,19 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> } else if (enclosingBlock(upstreamEnd.deprecatedNode()) != upstreamStart.deprecatedNode()) {
</span><del>- // The visibleEnd. It must be an ancestor of the paragraph start.
- // We can bail as we have a full block to work with.
- ASSERT(upstreamStart.deprecatedNode()->isDescendantOf(enclosingBlock(upstreamEnd.deprecatedNode())));
- return nullptr;
</del><ins>+ // The visibleEnd. If it is an ancestor of the paragraph start, then
+ // we can bail as we have a full block to work with.
+ if (upstreamStart.deprecatedNode()->isDescendantOf(enclosingBlock(upstreamEnd.deprecatedNode())))
+ return nullptr;
</ins><span class="cx"> } else if (isEndOfEditableOrNonEditableContent(visibleEnd)) {
</span><span class="cx"> // At the end of the editable region. We can bail here as well.
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If upstreamStart is not editable, then we can bail here.
+ if (!isEditablePosition(upstreamStart))
+ return nullptr;
</ins><span class="cx"> RefPtr<Node> newBlock = insertNewDefaultParagraphElementAt(upstreamStart);
</span><span class="cx">
</span><span class="cx"> bool endWasBr = visibleParagraphEnd.deepEquivalent().deprecatedNode()->hasTagName(brTag);
</span><span class="lines">@@ -1199,7 +1202,8 @@
</span><span class="cx"> afterParagraph = VisiblePosition(afterParagraph.deepEquivalent());
</span><span class="cx">
</span><span class="cx"> if (beforeParagraph.isNotNull() && !isRenderedTable(beforeParagraph.deepEquivalent().deprecatedNode())
</span><del>- && ((!isEndOfParagraph(beforeParagraph) && !isStartOfParagraph(beforeParagraph)) || beforeParagraph == afterParagraph)) {
</del><ins>+ && ((!isEndOfParagraph(beforeParagraph) && !isStartOfParagraph(beforeParagraph)) || beforeParagraph == afterParagraph)
+ && isEditablePosition(beforeParagraph.deepEquivalent())) {
</ins><span class="cx"> // FIXME: Trim text between beforeParagraph and afterParagraph if they aren't equal.
</span><span class="cx"> insertNodeAt(createBreakElement(document()), beforeParagraph.deepEquivalent());
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/htmlediting.cpp (195023 => 195024)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/htmlediting.cpp 2016-01-14 11:11:35 UTC (rev 195023)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/htmlediting.cpp 2016-01-14 11:14:30 UTC (rev 195024)
</span><span class="lines">@@ -287,6 +287,9 @@
</span><span class="cx">
</span><span class="cx"> Position firstEditablePositionAfterPositionInRoot(const Position& position, Node* highestRoot)
</span><span class="cx"> {
</span><ins>+ if (!highestRoot)
+ return Position();
+
</ins><span class="cx"> // position falls before highestRoot.
</span><span class="cx"> if (comparePositions(position, firstPositionInNode(highestRoot)) == -1 && highestRoot->hasEditableStyle())
</span><span class="cx"> return firstPositionInNode(highestRoot);
</span><span class="lines">@@ -312,6 +315,9 @@
</span><span class="cx">
</span><span class="cx"> Position lastEditablePositionBeforePositionInRoot(const Position& position, Node* highestRoot)
</span><span class="cx"> {
</span><ins>+ if (!highestRoot)
+ return Position();
+
</ins><span class="cx"> // When position falls after highestRoot, the result is easy to compute.
</span><span class="cx"> if (comparePositions(position, lastPositionInNode(highestRoot)) == 1)
</span><span class="cx"> return lastPositionInNode(highestRoot);
</span></span></pre>
</div>
</div>
</body>
</html>