<!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>[165123] branches/safari-537.75-branch</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/165123">165123</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 13:25:38 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/163465">r163465</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingInlineIteratorh">branches/safari-537.75-branch/Source/WebCore/rendering/InlineIterator.h</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingRenderTextcpp">branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCorerenderingRenderTexth">branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsfasttextcharacteratcrashexpectedtxt">branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestsfasttextcharacteratcrashhtml">branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165122 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-05 21:13:56 UTC (rev 165122)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r163465.
+
+ 2014-02-04 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Move characterAt index checks from InlineIterator to RenderText
+ https://bugs.webkit.org/show_bug.cgi?id=128224
+
+ Move characterAt index checks from InlineIterator to RenderText
+ so that all RenderText calls are covered. Few safe instances are
+ now covered with uncheckedCharacterAt.
+
+ Merged from Blink:
+ http://src.chromium.org/viewvc/blink?view=revision&revision=150830
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/character-at-crash-expected.txt: Added.
+ * fast/text/character-at-crash.html: Added.
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r164933.
</span><span class="cx">
</span><span class="cx"> 2014-03-01 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfasttextcharacteratcrashexpectedtxtfromrev163465trunkLayoutTestsfasttextcharacteratcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash-expected.txt (from rev 163465, trunk/LayoutTests/fast/text/character-at-crash-expected.txt) (0 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash-expected.txt 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass. Test didn't crash.
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestsfasttextcharacteratcrashhtmlfromrev163465trunkLayoutTestsfasttextcharacteratcrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash.html (from rev 163465, trunk/LayoutTests/fast/text/character-at-crash.html) (0 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/fast/text/character-at-crash.html 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<style>
+div {
+ -webkit-writing-mode: vertical-lr;
+ -webkit-text-combine: horizontal;
+ height: 7px;
+ white-space: pre-wrap;
+}
+</style>
+<div>
+foo
+ <script></script>
+ <script></script>
+</div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.documentElement.offsetTop;
+document.documentElement.innerHTML = "Pass. Test didn't crash.";
+</script>
+</html>
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165122 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-05 21:13:56 UTC (rev 165122)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r163465.
+
+ 2014-02-04 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Move characterAt index checks from InlineIterator to RenderText
+ https://bugs.webkit.org/show_bug.cgi?id=128224
+
+ Reviewed by Simon Fraser.
+
+ Move characterAt index checks from InlineIterator to RenderText
+ so that all RenderText calls are covered. Few safe instances are
+ now covered with uncheckedCharacterAt.
+
+ Merged from Blink:
+ http://src.chromium.org/viewvc/blink?view=revision&revision=150830
+
+ Test: fast/text/character-at-crash.html
+
+ * rendering/InlineIterator.h:
+ (WebCore::InlineIterator::characterAt):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::computePreferredLogicalWidths):
+ * rendering/RenderText.h:
+ (WebCore::RenderText::operator[]):
+ (WebCore::RenderText::uncheckedCharacterAt):
+ (WebCore::RenderText::characterAt):
+
+2014-03-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r164933.
</span><span class="cx">
</span><span class="cx"> 2014-03-01 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingInlineIteratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/InlineIterator.h (165122 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/InlineIterator.h 2014-03-05 21:13:56 UTC (rev 165122)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/InlineIterator.h 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -374,11 +374,7 @@
</span><span class="cx"> if (!m_obj || !m_obj->isText())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RenderText* text = toRenderText(m_obj);
- if (index >= text->textLength())
- return 0;
-
- return text->characterAt(index);
</del><ins>+ return toRenderText(m_obj)->characterAt(index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline UChar InlineIterator::current() const
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.cpp (165122 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.cpp 2014-03-05 21:13:56 UTC (rev 165122)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.cpp 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx"> bool breakAll = (styleToUse->wordBreak() == BreakAllWordBreak || styleToUse->wordBreak() == BreakWordBreak) && styleToUse->autoWrap();
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < len; i++) {
</span><del>- UChar c = characterAt(i);
</del><ins>+ UChar c = uncheckedCharacterAt(i);
</ins><span class="cx">
</span><span class="cx"> bool previousCharacterIsSpace = isSpace;
</span><span class="cx">
</span><span class="lines">@@ -1047,7 +1047,7 @@
</span><span class="cx"> j++;
</span><span class="cx"> if (j == len)
</span><span class="cx"> break;
</span><del>- c = characterAt(j);
</del><ins>+ c = uncheckedCharacterAt(j);
</ins><span class="cx"> if (isBreakable(breakIterator, j, nextBreakable, breakNBSP) && characterAt(j - 1) != softHyphen)
</span><span class="cx"> break;
</span><span class="cx"> if (breakAll) {
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.h (165122 => 165123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.h 2014-03-05 21:13:56 UTC (rev 165122)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderText.h 2014-03-05 21:25:38 UTC (rev 165123)
</span><span class="lines">@@ -70,8 +70,9 @@
</span><span class="cx"> const LChar* characters8() const { return m_text.impl()->characters8(); }
</span><span class="cx"> const UChar* characters16() const { return m_text.impl()->characters16(); }
</span><span class="cx"> const UChar* characters() const { return m_text.characters(); }
</span><del>- UChar characterAt(unsigned i) const { return is8Bit() ? characters8()[i] : characters16()[i]; }
- UChar operator[](unsigned i) const { return characterAt(i); }
</del><ins>+ UChar characterAt(unsigned) const;
+ UChar uncheckedCharacterAt(unsigned) const;
+ UChar operator[](unsigned i) const { return uncheckedCharacterAt(i); }
</ins><span class="cx"> unsigned textLength() const { return m_text.length(); } // non virtual implementation of length()
</span><span class="cx"> void positionLineBox(InlineBox*);
</span><span class="cx">
</span><span class="lines">@@ -198,6 +199,20 @@
</span><span class="cx"> InlineTextBox* m_lastTextBox;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline UChar RenderText::uncheckedCharacterAt(unsigned i) const
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(i < textLength());
+ return is8Bit() ? characters8()[i] : characters16()[i];
+}
+
+inline UChar RenderText::characterAt(unsigned i) const
+{
+ if (i >= textLength())
+ return 0;
+
+ return uncheckedCharacterAt(i);
+}
+
</ins><span class="cx"> inline RenderText* toRenderText(RenderObject* object)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isText());
</span></span></pre>
</div>
</div>
</body>
</html>