<!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>[170429] 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/170429">170429</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-06-25 09:56:42 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Crash at com.apple.WebCore: WebCore::AlternativeTextController::removeDictationAlternativesForMarker + 43
https://bugs.webkit.org/show_bug.cgi?id=134226
Reviewed by Enrica Casucci.
Source/WebCore:
Unchecked access of details pointer in the Document marker led to the crash.
It seems erroneous to allow creation of a DocumentMarker without details when one is expected, because it
carries the dictation context (not just the description).
Also, add in ASSERTs to catch scenarios where a nullptr might be passed in.
Test: platform/mac/editing/input/crash-for-empty-text-alternative.html
* dom/DocumentMarker.cpp:
(WebCore::DocumentMarker::DocumentMarker):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::removeDictationAlternativesForMarker):
LayoutTests:
* platform/mac-wk2/TestExpectations:
Skip test on wk2 because dictation related tests are not yet supported (89401)
* platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt: Added.
* platform/mac/editing/input/crash-for-empty-text-alternative.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkercpp">trunk/Source/WebCore/dom/DocumentMarker.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmaceditinginputcrashforemptytextalternativeexpectedtxt">trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaceditinginputcrashforemptytextalternativehtml">trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170428 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-25 16:37:19 UTC (rev 170428)
+++ trunk/LayoutTests/ChangeLog 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-25 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Crash at com.apple.WebCore: WebCore::AlternativeTextController::removeDictationAlternativesForMarker + 43
+ https://bugs.webkit.org/show_bug.cgi?id=134226
+
+ Reviewed by Enrica Casucci.
+
+ * platform/mac-wk2/TestExpectations:
+ Skip test on wk2 because dictation related tests are not yet supported (89401)
+ * platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt: Added.
+ * platform/mac/editing/input/crash-for-empty-text-alternative.html: Added.
+
</ins><span class="cx"> 2014-06-25 Laszlo Gombos <l.gombos@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove build guard for progress element
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaceditinginputcrashforemptytextalternativeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt (0 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative-expected.txt 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Ensure that a empty text alternative does not lead to a crash
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+tisatest
+TEST COMPLETE
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaceditinginputcrashforemptytextalternativehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative.html (0 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative.html (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/input/crash-for-empty-text-alternative.html 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<html>
+<head>
+<script src="../../../../editing/editing.js" language="JavaScript" type="text/JavaScript" ></script>
+<script src="../../../../resources/js-test-pre.js"></script>
+
+<style>
+body { margin: 0; padding: 0 }
+</style>
+</head>
+<body>
+<pre id="description"></pre>
+<div id="test" contenteditable>thisisatest</div>
+<p id="console"></p>
+<script type="text/javascript">
+ description("Ensure that a empty text alternative does not lead to a crash");
+
+
+ if (window.testRunner) {
+
+ try {
+
+ document.getElementById("test").focus();
+
+ moveSelectionForwardByCharacterCommand();
+ moveSelectionForwardByCharacterCommand();
+
+ var dictatedString = textInputController.makeDictatedString(" ", " ", 0, 1);
+ textInputController.insertText(dictatedString);
+
+ moveSelectionForwardByCharacterCommand();
+ moveSelectionForwardByCharacterCommand();
+
+ for ( var k = 0; k < 4; k++) {
+ textInputController.doCommand("deleteBackward:");
+ }
+
+ document.write("TEST COMPLETE");
+
+ } catch (ex) {
+ document.write("Exception: " + ex.description);
+ }
+ } else {
+ document.write("(cannot run interactively)");
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (170428 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-06-25 16:37:19 UTC (rev 170428)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> # Missing functionality of textInputController
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=89401
</span><span class="cx"> platform/mac/editing/input/insert-dictated-text.html
</span><ins>+platform/mac/editing/input/crash-for-empty-text-alternative.html
</ins><span class="cx"> platform/mac/editing/input/edit-dictated-text-with-alternative.html
</span><span class="cx"> platform/mac/editing/attributed-string/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170428 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-25 16:37:19 UTC (rev 170428)
+++ trunk/Source/WebCore/ChangeLog 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-25 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Crash at com.apple.WebCore: WebCore::AlternativeTextController::removeDictationAlternativesForMarker + 43
+ https://bugs.webkit.org/show_bug.cgi?id=134226
+
+ Reviewed by Enrica Casucci.
+
+ Unchecked access of details pointer in the Document marker led to the crash.
+ It seems erroneous to allow creation of a DocumentMarker without details when one is expected, because it
+ carries the dictation context (not just the description).
+ Also, add in ASSERTs to catch scenarios where a nullptr might be passed in.
+
+ Test: platform/mac/editing/input/crash-for-empty-text-alternative.html
+
+ * dom/DocumentMarker.cpp:
+ (WebCore::DocumentMarker::DocumentMarker):
+ * editing/AlternativeTextController.cpp:
+ (WebCore::AlternativeTextController::removeDictationAlternativesForMarker):
+
</ins><span class="cx"> 2014-06-25 Laszlo Gombos <l.gombos@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove build guard for progress element
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarker.cpp (170428 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarker.cpp 2014-06-25 16:37:19 UTC (rev 170428)
+++ trunk/Source/WebCore/dom/DocumentMarker.cpp 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -111,8 +111,9 @@
</span><span class="cx"> : m_type(type)
</span><span class="cx"> , m_startOffset(startOffset)
</span><span class="cx"> , m_endOffset(endOffset)
</span><del>- , m_details(description.isEmpty() ? 0 : DocumentMarkerDescription::create(description))
</del><ins>+ , m_details(DocumentMarkerDescription::create(description))
</ins><span class="cx"> {
</span><ins>+ ASSERT(m_details);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DocumentMarker::DocumentMarker(unsigned startOffset, unsigned endOffset, bool activeMatch)
</span><span class="lines">@@ -121,6 +122,7 @@
</span><span class="cx"> , m_endOffset(endOffset)
</span><span class="cx"> , m_details(DocumentMarkerTextMatch::instanceFor(activeMatch))
</span><span class="cx"> {
</span><ins>+ ASSERT(m_details);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DocumentMarker::DocumentMarker(MarkerType type, unsigned startOffset, unsigned endOffset, PassRefPtr<DocumentMarkerDetails> details)
</span><span class="lines">@@ -129,6 +131,7 @@
</span><span class="cx"> , m_endOffset(endOffset)
</span><span class="cx"> , m_details(details)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_details);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentMarker::shiftOffsets(int delta)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (170428 => 170429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp 2014-06-25 16:37:19 UTC (rev 170428)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp 2014-06-25 16:56:42 UTC (rev 170429)
</span><span class="lines">@@ -702,9 +702,11 @@
</span><span class="cx"> void AlternativeTextController::removeDictationAlternativesForMarker(const DocumentMarker* marker)
</span><span class="cx"> {
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><del>- DictationMarkerDetails* details = static_cast<DictationMarkerDetails*>(marker->details());
- if (AlternativeTextClient* client = alternativeTextClient())
- client->removeDictationAlternatives(details->dictationContext());
</del><ins>+ ASSERT(marker->details());
+ if (DictationMarkerDetails* details = static_cast<DictationMarkerDetails*>(marker->details())) {
+ if (AlternativeTextClient* client = alternativeTextClient())
+ client->removeDictationAlternatives(details->dictationContext());
+ }
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(marker);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>