<!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>[202757] trunk/Source</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/202757">202757</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-01 13:59:08 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Possible null Range dereference under computeAutocorrectionContext()
https://bugs.webkit.org/show_bug.cgi?id=159328
<rdar://problem/26766720>
Reviewed by Benjamin Poulain.
Source/WebCore:
* editing/Editor.cpp:
(WebCore::Editor::compositionRange):
* editing/Editor.h:
Update to return a RefPtr instead of a PassRefPtr and use nullptr
instead of 0 in the implementation.
Source/WebKit2:
The code in computeAutocorrectionContext() was checking Editor::hasComposition()
before dereferencing Editor::compositionRange(). However, compositionRange()
can also return null in other cases (e.g. compositionStart == compositionEnd).
Drop the check for hasComposition() and do a null check on the value returned
by compositionRange() instead.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::computeAutocorrectionContext):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202756 => 202757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-01 20:58:12 UTC (rev 202756)
+++ trunk/Source/WebCore/ChangeLog 2016-07-01 20:59:08 UTC (rev 202757)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-01 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Possible null Range dereference under computeAutocorrectionContext()
+ https://bugs.webkit.org/show_bug.cgi?id=159328
+ <rdar://problem/26766720>
+
+ Reviewed by Benjamin Poulain.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::compositionRange):
+ * editing/Editor.h:
+ Update to return a RefPtr instead of a PassRefPtr and use nullptr
+ instead of 0 in the implementation.
+
</ins><span class="cx"> 2016-07-01 Jon Davis <jond@apple.com>
</span><span class="cx">
</span><span class="cx"> Updated Picture element and WOFF 2 status
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (202756 => 202757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-07-01 20:58:12 UTC (rev 202756)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-07-01 20:59:08 UTC (rev 202757)
</span><span class="lines">@@ -2823,15 +2823,15 @@
</span><span class="cx"> revealSelectionAfterEditingOperation(ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Editor::compositionRange() const
</del><ins>+RefPtr<Range> Editor::compositionRange() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_compositionNode)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> unsigned length = m_compositionNode->length();
</span><span class="cx"> unsigned start = std::min(m_compositionStart, length);
</span><span class="cx"> unsigned end = std::min(std::max(start, m_compositionEnd), length);
</span><span class="cx"> if (start >= end)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return Range::create(m_compositionNode->document(), m_compositionNode.get(), start, m_compositionNode.get(), end);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (202756 => 202757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-07-01 20:58:12 UTC (rev 202756)
+++ trunk/Source/WebCore/editing/Editor.h 2016-07-01 20:59:08 UTC (rev 202757)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> WEBCORE_EXPORT void confirmComposition(const String&); // if no existing composition, replaces selection
</span><span class="cx"> WEBCORE_EXPORT void cancelComposition();
</span><span class="cx"> bool cancelCompositionIfSelectionIsInvalid();
</span><del>- WEBCORE_EXPORT PassRefPtr<Range> compositionRange() const;
</del><ins>+ WEBCORE_EXPORT RefPtr<Range> compositionRange() const;
</ins><span class="cx"> WEBCORE_EXPORT bool getCompositionSelection(unsigned& selectionStart, unsigned& selectionEnd) const;
</span><span class="cx">
</span><span class="cx"> // getting international text input composition state (for use by InlineTextBox)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202756 => 202757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-01 20:58:12 UTC (rev 202756)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-01 20:59:08 UTC (rev 202757)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-07-01 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Possible null Range dereference under computeAutocorrectionContext()
+ https://bugs.webkit.org/show_bug.cgi?id=159328
+ <rdar://problem/26766720>
+
+ Reviewed by Benjamin Poulain.
+
+ The code in computeAutocorrectionContext() was checking Editor::hasComposition()
+ before dereferencing Editor::compositionRange(). However, compositionRange()
+ can also return null in other cases (e.g. compositionStart == compositionEnd).
+
+ Drop the check for hasComposition() and do a null check on the value returned
+ by compositionRange() instead.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::computeAutocorrectionContext):
+
</ins><span class="cx"> 2016-07-01 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent crash when attempting to copy an image
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (202756 => 202757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-07-01 20:58:12 UTC (rev 202756)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-07-01 20:59:08 UTC (rev 202757)
</span><span class="lines">@@ -2191,12 +2191,12 @@
</span><span class="cx"> if (frame.selection().isRange())
</span><span class="cx"> selectedText = plainTextReplacingNoBreakSpace(frame.selection().selection().toNormalizedRange().get());
</span><span class="cx">
</span><del>- if (frame.editor().hasComposition()) {
- range = Range::create(*frame.document(), frame.editor().compositionRange()->startPosition(), startPosition);
</del><ins>+ if (auto compositionRange = frame.editor().compositionRange()) {
+ range = Range::create(*frame.document(), compositionRange->startPosition(), startPosition);
</ins><span class="cx"> String markedTextBefore;
</span><span class="cx"> if (range)
</span><span class="cx"> markedTextBefore = plainTextReplacingNoBreakSpace(range.get());
</span><del>- range = Range::create(*frame.document(), endPosition, frame.editor().compositionRange()->endPosition());
</del><ins>+ range = Range::create(*frame.document(), endPosition, compositionRange->endPosition());
</ins><span class="cx"> String markedTextAfter;
</span><span class="cx"> if (range)
</span><span class="cx"> markedTextAfter = plainTextReplacingNoBreakSpace(range.get());
</span></span></pre>
</div>
</div>
</body>
</html>