<!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>[178462] 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/178462">178462</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 16:18:39 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/165385">r165385</a>): Crash when applying autocorrection exceeds maximum text area length.
https://bugs.webkit.org/show_bug.cgi?id=137902
rdar://problem/18568864
Reviewed by Darin Adler.
Source/WebCore:
Test: editing/text-iterator/invalid-subrange.html
characterSubrange should check the iterator position after each advance.
This changed adds a new method to the Internals object to be able to test this.
* editing/TextIterator.cpp:
(WebCore::characterSubrange):
(WebCore::TextIterator::subrange):
(WebCore::findPlainText):
* testing/Internals.cpp:
(WebCore::Internals::subrange):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* editing/text-iterator/invalid-subrange-expected.txt: Added.
* editing/text-iterator/invalid-subrange.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingtextiteratorinvalidsubrangeexpectedtxt">trunk/LayoutTests/editing/text-iterator/invalid-subrange-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingtextiteratorinvalidsubrangehtml">trunk/LayoutTests/editing/text-iterator/invalid-subrange.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/LayoutTests/ChangeLog 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-14 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (r165385): Crash when applying autocorrection exceeds maximum text area length.
+ https://bugs.webkit.org/show_bug.cgi?id=137902
+ rdar://problem/18568864
+
+ Reviewed by Darin Adler.
+
+ * editing/text-iterator/invalid-subrange-expected.txt: Added.
+ * editing/text-iterator/invalid-subrange.html: Added.
+
</ins><span class="cx"> 2015-01-14 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r154769): Wrong <title> taken as a tooltip for SVG element.
</span></span></pre></div>
<a id="trunkLayoutTestseditingtextiteratorinvalidsubrangeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/text-iterator/invalid-subrange-expected.txt (0 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/text-iterator/invalid-subrange-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/text-iterator/invalid-subrange-expected.txt 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS internals.lengthFromRange(container, subrange) is 0
+PASS internals.lengthFromRange(container, subrange) is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingtextiteratorinvalidsubrangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/text-iterator/invalid-subrange.html (0 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/text-iterator/invalid-subrange.html (rev 0)
+++ trunk/LayoutTests/editing/text-iterator/invalid-subrange.html 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div id="test" contenteditable>
+<p>hello world.</p>
+</div>
+<div id="console"></div>
+<script>
+
+if (!window.internals)
+ testFailed('This test requires internals object');
+else {
+ var container = document.getElementById('test');
+
+ var p = document.querySelector('#test p');
+ var r = internals.rangeFromLocationAndLength(container, 0, 1);
+ // This offset is valid, the length is past the end of the range
+ var subrange = internals.subrange(r, 5, 100);
+ shouldBe('internals.lengthFromRange(container, subrange)', '0');
+ // This offset is past the end of the range
+ subrange = internals.subrange(r, 100, 1);
+ shouldBe('internals.lengthFromRange(container, subrange)', '0');
+ container.style.display = 'none';
+}
+
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/Source/WebCore/ChangeLog 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-14 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (r165385): Crash when applying autocorrection exceeds maximum text area length.
+ https://bugs.webkit.org/show_bug.cgi?id=137902
+ rdar://problem/18568864
+
+ Reviewed by Darin Adler.
+
+ Test: editing/text-iterator/invalid-subrange.html
+
+ characterSubrange should check the iterator position after each advance.
+ This changed adds a new method to the Internals object to be able to test this.
+
+ * editing/TextIterator.cpp:
+ (WebCore::characterSubrange):
+ (WebCore::TextIterator::subrange):
+ (WebCore::findPlainText):
+ * testing/Internals.cpp:
+ (WebCore::Internals::subrange):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2015-01-14 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r154769): Wrong <title> taken as a tooltip for SVG element.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -1463,16 +1463,22 @@
</span><span class="cx"> m_runOffset = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Range> characterSubrange(CharacterIterator& it, int offset, int length)
</del><ins>+static Ref<Range> characterSubrange(Document& document, CharacterIterator& it, int offset, int length)
</ins><span class="cx"> {
</span><span class="cx"> it.advance(offset);
</span><ins>+ if (it.atEnd())
+ return Range::create(document);
+
</ins><span class="cx"> Ref<Range> start = it.range();
</span><span class="cx">
</span><span class="cx"> if (length > 1)
</span><span class="cx"> it.advance(length - 1);
</span><ins>+ if (it.atEnd())
+ return Range::create(document);
+
</ins><span class="cx"> Ref<Range> end = it.range();
</span><span class="cx">
</span><del>- return Range::create(start->startContainer()->document(),
</del><ins>+ return Range::create(document,
</ins><span class="cx"> start->startContainer(), start->startOffset(),
</span><span class="cx"> end->endContainer(), end->endOffset());
</span><span class="cx"> }
</span><span class="lines">@@ -2382,7 +2388,7 @@
</span><span class="cx"> Ref<Range> TextIterator::subrange(Range* entireRange, int characterOffset, int characterCount)
</span><span class="cx"> {
</span><span class="cx"> CharacterIterator entireRangeIterator(*entireRange);
</span><del>- return characterSubrange(entireRangeIterator, characterOffset, characterCount);
</del><ins>+ return characterSubrange(entireRange->ownerDocument(), entireRangeIterator, characterOffset, characterCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isInsideReplacedElement(TextIterator& iterator)
</span><span class="lines">@@ -2602,7 +2608,7 @@
</span><span class="cx">
</span><span class="cx"> // Then, find the document position of the start and the end of the text.
</span><span class="cx"> CharacterIterator computeRangeIterator(range, TextIteratorEntersTextControls);
</span><del>- return characterSubrange(computeRangeIterator, matchStart, matchLength);
</del><ins>+ return characterSubrange(range.ownerDocument(), computeRangeIterator, matchStart, matchLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -1078,6 +1078,16 @@
</span><span class="cx"> return range->text();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<Range> Internals::subrange(Range* range, int rangeLocation, int rangeLength, ExceptionCode& ec)
+{
+ if (!range) {
+ ec = INVALID_ACCESS_ERR;
+ return 0;
+ }
+
+ return TextIterator::subrange(range, rangeLocation, rangeLength);
+}
+
</ins><span class="cx"> void Internals::setDelegatesScrolling(bool enabled, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/Source/WebCore/testing/Internals.h 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> unsigned locationFromRange(Element* scope, const Range*, ExceptionCode&);
</span><span class="cx"> unsigned lengthFromRange(Element* scope, const Range*, ExceptionCode&);
</span><span class="cx"> String rangeAsText(const Range*, ExceptionCode&);
</span><ins>+ PassRefPtr<Range> subrange(Range* range, int rangeLocation, int rangeLength, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void setDelegatesScrolling(bool enabled, ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (178461 => 178462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-01-15 00:01:05 UTC (rev 178461)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-01-15 00:18:39 UTC (rev 178462)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> [RaisesException] unsigned long locationFromRange(Element scope, Range range);
</span><span class="cx"> [RaisesException] unsigned long lengthFromRange(Element scope, Range range);
</span><span class="cx"> [RaisesException] DOMString rangeAsText(Range range);
</span><ins>+ [RaisesException] Range subrange(Range range, long rangeLocation, long rangeLength);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void setDelegatesScrolling(boolean enabled);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>