<!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>[204805] releases/WebKitGTK/webkit-2.12</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/204805">204805</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 04:11:24 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203249">r203249</a> - editing/spelling/spellcheck-async.html sometimes crashes with GuardMalloc
https://bugs.webkit.org/show_bug.cgi?id=142969
<rdar://problem/27331095>
Reviewed by Alex Christensen.
Fix based on a Blink change (patch by <rouslan@chromium.org>):
<https://chromium.googlesource.com/chromium/blink/+/c713736b122c2224804b2db72f1f711cb47ee260%5E%21/#F1>
Source/WebCore:
Test: editing/spelling/copy-paste-crash.html
editing/spelling/spellcheck-async.html
* editing/SpellChecker.cpp:
(WebCore::SpellCheckRequest::didSucceed):
(WebCore::SpellCheckRequest::didCancel):
LayoutTests:
* editing/spelling/copy-paste-crash-expected.txt: Added.
* editing/spelling/copy-paste-crash.html: Added.
* platform/platform/mac-wk2/TestExpectations: Skip test on mac-wk2 since all Spelling tests are
currently broken (see <https://webkit.org/b/105616>).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsplatformmacwk2TestExpectations">releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreeditingSpellCheckercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/editing/SpellChecker.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestseditingspellingcopypastecrashexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestseditingspellingcopypastecrashhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204804 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 11:08:34 UTC (rev 204804)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-07-14 Brent Fulgham <bfulgham@apple.com>
+
+ editing/spelling/spellcheck-async.html sometimes crashes with GuardMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=142969
+ <rdar://problem/27331095>
+
+ Reviewed by Alex Christensen.
+
+ Fix based on a Blink change (patch by <rouslan@chromium.org>):
+ <https://chromium.googlesource.com/chromium/blink/+/c713736b122c2224804b2db72f1f711cb47ee260%5E%21/#F1>
+
+ * editing/spelling/copy-paste-crash-expected.txt: Added.
+ * editing/spelling/copy-paste-crash.html: Added.
+ * platform/platform/mac-wk2/TestExpectations: Skip test on mac-wk2 since all Spelling tests are
+ currently broken (see <https://webkit.org/b/105616>).
+
</ins><span class="cx"> 2016-07-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Return values of JSArray::createUninitialized (and related) are not consistently checked for nullptr
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestseditingspellingcopypastecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash-expected.txt (0 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash-expected.txt 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Spell check does not crash after Ctrl-X/Ctrl-V/type text in ASAN. To test manually, type 'A', Ctrl-A, Ctrl-X, Ctrl-V, and start typing again. The test succeeds when there's no crash in the last step.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS internals.markerCountForNode(destination.childNodes[0], "spelling") became different from 0
+PASS Did not crash
+Spell wellcome. Is it broken?A simple test for a spell check.AA
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestseditingspellingcopypastecrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash.html (0 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/editing/spelling/copy-paste-crash.html 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/util.js"></script>
+</head>
+<body>
+<div id="container">
+ <div id="destination" contentEditable>
+ A simple test for a spell check.
+ </div>
+</div>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+description("Spell check does not crash after Ctrl-X/Ctrl-V/type text in ASAN. "
+ + "To test manually, type 'A', Ctrl-A, Ctrl-X, Ctrl-V, and start typing again. "
+ + "The test succeeds when there's no crash in the last step.");
+
+initSpellTest("destination", "Spell wellcome. Is it broken?", function(textNode) {
+ var behaviors = ["win", "mac"];
+ for (var i = 0; i < behaviors.length; i++) {
+ internals.settings.setEditingBehavior(behaviors[i]);
+ document.execCommand("SelectAll");
+ document.execCommand("Cut");
+ document.execCommand("Paste");
+ document.execCommand("InsertText", false, "A");
+ }
+
+ log("PASS Did not crash");
+ if (window.testRunner)
+ testRunner.notifyDone();
+});
+</script>
+<div id="console"></div>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac-wk2/TestExpectations (204804 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac-wk2/TestExpectations 2016-08-23 11:08:34 UTC (rev 204804)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac-wk2/TestExpectations 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> # [WK2] [Mac] Spellcheck tests don't seem to work
</span><span class="cx"> webkit.org/b/105616 editing/spelling/context-menu-suggestions-multiword-selection.html
</span><span class="cx"> webkit.org/b/105616 editing/spelling/context-menu-suggestions-subword-selection.html
</span><ins>+webkit.org/b/105616 editing/spelling/copy-paste-crash.html
</ins><span class="cx"> webkit.org/b/105616 editing/spelling/delete-into-misspelled-word.html
</span><span class="cx"> webkit.org/b/105616 editing/spelling/editing-multiple-words-with-markers.html
</span><span class="cx"> webkit.org/b/105616 editing/spelling/editing-word-with-marker-2.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204804 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 11:08:34 UTC (rev 204804)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-07-14 Brent Fulgham <bfulgham@apple.com>
+
+ editing/spelling/spellcheck-async.html sometimes crashes with GuardMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=142969
+ <rdar://problem/27331095>
+
+ Reviewed by Alex Christensen.
+
+ Fix based on a Blink change (patch by <rouslan@chromium.org>):
+ <https://chromium.googlesource.com/chromium/blink/+/c713736b122c2224804b2db72f1f711cb47ee260%5E%21/#F1>
+
+ Test: editing/spelling/copy-paste-crash.html
+ editing/spelling/spellcheck-async.html
+
+ * editing/SpellChecker.cpp:
+ (WebCore::SpellCheckRequest::didSucceed):
+ (WebCore::SpellCheckRequest::didCancel):
+
</ins><span class="cx"> 2016-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Fix a crash in fast/canvas/canvas-getImageData-invalid-result-buffer-crash.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreeditingSpellCheckercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/editing/SpellChecker.cpp (204804 => 204805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/editing/SpellChecker.cpp 2016-08-23 11:08:34 UTC (rev 204804)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/editing/SpellChecker.cpp 2016-08-23 11:11:24 UTC (rev 204805)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_checker)
</span><span class="cx"> return;
</span><ins>+
+ Ref<SpellCheckRequest> protectedThis(*this);
</ins><span class="cx"> m_checker->didCheckSucceed(m_requestData.sequence(), results);
</span><span class="cx"> m_checker = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -85,6 +87,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_checker)
</span><span class="cx"> return;
</span><ins>+
+ Ref<SpellCheckRequest> protectedThis(*this);
</ins><span class="cx"> m_checker->didCheckCancel(m_requestData.sequence());
</span><span class="cx"> m_checker = nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>