<!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>[164851] trunk/Source/JavaScriptCore</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/164851">164851</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 21:30:09 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>indexOf and lastIndexOf shouldn't resolve ropes when needle is longer than haystack
https://bugs.webkit.org/show_bug.cgi?id=129466
Reviewed by Michael Saboff.
Refactored the code to avoid calling JSString::value when needle is longer than haystack.
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncIndexOf):
(JSC::stringProtoFuncLastIndexOf):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164850 => 164851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-28 05:11:55 UTC (rev 164850)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-28 05:30:09 UTC (rev 164851)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-27 Ryosuke Niwa <rniwa@webkit.org>
+
+ indexOf and lastIndexOf shouldn't resolve ropes when needle is longer than haystack
+ https://bugs.webkit.org/show_bug.cgi?id=129466
+
+ Reviewed by Michael Saboff.
+
+ Refactored the code to avoid calling JSString::value when needle is longer than haystack.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncIndexOf):
+ (JSC::stringProtoFuncLastIndexOf):
+
</ins><span class="cx"> 2014-02-27 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve how ContentSearchUtilities::lineEndings works by supporting the three common line endings.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (164850 => 164851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-28 05:11:55 UTC (rev 164850)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-28 05:30:09 UTC (rev 164851)
</span><span class="lines">@@ -752,18 +752,16 @@
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec);
</span><del>- String s = thisValue.toString(exec)->value(exec);
</del><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> JSValue a1 = exec->argument(1);
</span><del>- String u2 = a0.toString(exec)->value(exec);
</del><span class="cx">
</span><del>- size_t result;
- if (a1.isUndefined())
- result = s.find(u2);
- else {
- unsigned pos;
- int len = s.length();
</del><ins>+ JSString* thisJSString = thisValue.toString(exec);
+ JSString* otherJSString = a0.toString(exec);
+
+ unsigned pos = 0;
+ if (!a1.isUndefined()) {
+ int len = thisJSString->length();
</ins><span class="cx"> if (a1.isUInt32())
</span><span class="cx"> pos = std::min<uint32_t>(a1.asUInt32(), len);
</span><span class="cx"> else {
</span><span class="lines">@@ -774,9 +772,12 @@
</span><span class="cx"> dpos = len;
</span><span class="cx"> pos = static_cast<unsigned>(dpos);
</span><span class="cx"> }
</span><del>- result = s.find(u2, pos);
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (thisJSString->length() < otherJSString->length() + pos)
+ return JSValue::encode(jsNumber(-1));
+
+ size_t result = thisJSString->value(exec).find(otherJSString->value(exec), pos);
</ins><span class="cx"> if (result == notFound)
</span><span class="cx"> return JSValue::encode(jsNumber(-1));
</span><span class="cx"> return JSValue::encode(jsNumber(result));
</span><span class="lines">@@ -787,25 +788,33 @@
</span><span class="cx"> JSValue thisValue = exec->hostThisValue();
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec);
</span><del>- String s = thisValue.toString(exec)->value(exec);
- int len = s.length();
</del><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> JSValue a1 = exec->argument(1);
</span><span class="cx">
</span><del>- String u2 = a0.toString(exec)->value(exec);
</del><ins>+ JSString* thisJSString = thisValue.toString(exec);
+ unsigned len = thisJSString->length();
+ JSString* otherJSString = a0.toString(exec);
+
</ins><span class="cx"> double dpos = a1.toIntegerPreserveNaN(exec);
</span><ins>+ unsigned startPosition;
</ins><span class="cx"> if (dpos < 0)
</span><del>- dpos = 0;
</del><ins>+ startPosition = 0;
</ins><span class="cx"> else if (!(dpos <= len)) // true for NaN
</span><del>- dpos = len;
</del><ins>+ startPosition = len;
+ else
+ startPosition = static_cast<unsigned>(dpos);
</ins><span class="cx">
</span><ins>+ if (len < otherJSString->length())
+ return JSValue::encode(jsNumber(-1));
+
+ String thisString = thisJSString->value(exec);
+ String otherString = otherJSString->value(exec);
</ins><span class="cx"> size_t result;
</span><del>- unsigned startPosition = static_cast<unsigned>(dpos);
</del><span class="cx"> if (!startPosition)
</span><del>- result = s.startsWith(u2) ? 0 : notFound;
</del><ins>+ result = thisString.startsWith(otherString) ? 0 : notFound;
</ins><span class="cx"> else
</span><del>- result = s.reverseFind(u2, startPosition);
</del><ins>+ result = thisString.reverseFind(otherString, startPosition);
</ins><span class="cx"> if (result == notFound)
</span><span class="cx"> return JSValue::encode(jsNumber(-1));
</span><span class="cx"> return JSValue::encode(jsNumber(result));
</span></span></pre>
</div>
</div>
</body>
</html>