<!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>[191462] branches/safari-601.1.46-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/191462">191462</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 11:36:16 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191364">r191364</a>. rdar://problem/22864960</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreyarrYarrPatterncpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/yarr/YarrPattern.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsjsregress150372expectedtxt">branches/safari-601.1.46-branch/LayoutTests/js/regress-150372-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsjsregress150372html">branches/safari-601.1.46-branch/LayoutTests/js/regress-150372.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsjsscripttestsregress150372js">branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-150372.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (191461 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-22 18:36:09 UTC (rev 191461)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191364. rdar://problem/22864960
+
+ 2015-10-20 Mark Lam <mark.lam@apple.com>
+
+ YarrPatternConstructor::containsCapturingTerms() should not assume that its terms.size() is greater than 0.
+ https://bugs.webkit.org/show_bug.cgi?id=150372
+
+ Reviewed by Geoffrey Garen.
+
+ * js/regress-150372-expected.txt: Added.
+ * js/regress-150372.html: Added.
+ * js/script-tests/regress-150372.js: Added.
+
+2015-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r191063. rdar://problem/22900764
</span><span class="cx">
</span><span class="cx"> 2015-10-14 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsregress150372expectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/regress-150372-expected.txt (0 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/regress-150372-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/regress-150372-expected.txt 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for https://bugs.webkit.org/show_bug.cgi?id=150372.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Did not crash.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsregress150372html"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/regress-150372.html (0 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/regress-150372.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/regress-150372.html 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-150372.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsjsscripttestsregress150372js"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-150372.js (0 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-150372.js (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/js/script-tests/regress-150372.js 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+description("Regression test for https://bugs.webkit.org/show_bug.cgi?id=150372.");
+
+// This test should not crash.
+var re = /.*(?:(?:(?:(?:(?:(?:)))))).*/;
+re.exec("hello");
+
+testPassed("Did not crash.");
</ins></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (191461 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-10-22 18:36:09 UTC (rev 191461)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r191364. rdar://problem/22864960
+
+ 2015-10-20 Mark Lam <mark.lam@apple.com>
+
+ YarrPatternConstructor::containsCapturingTerms() should not assume that its terms.size() is greater than 0.
+ https://bugs.webkit.org/show_bug.cgi?id=150372
+
+ Reviewed by Geoffrey Garen.
+
+ * yarr/YarrPattern.cpp:
+ (JSC::Yarr::CharacterClassConstructor::CharacterClassConstructor):
+ (JSC::Yarr::YarrPatternConstructor::optimizeBOL):
+ (JSC::Yarr::YarrPatternConstructor::containsCapturingTerms):
+ (JSC::Yarr::YarrPatternConstructor::optimizeDotStarWrappedExpressions):
+
</ins><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r189834. rdar://problem/22807373
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreyarrYarrPatterncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/yarr/YarrPattern.cpp (191461 => 191462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/yarr/YarrPattern.cpp 2015-10-22 18:36:09 UTC (rev 191461)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/yarr/YarrPattern.cpp 2015-10-22 18:36:16 UTC (rev 191462)
</span><span class="lines">@@ -739,11 +739,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool containsCapturingTerms(PatternAlternative* alternative, size_t firstTermIndex, size_t lastTermIndex)
</del><ins>+ bool containsCapturingTerms(PatternAlternative* alternative, size_t firstTermIndex, size_t endIndex)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PatternTerm>& terms = alternative->m_terms;
</span><span class="cx">
</span><del>- for (size_t termIndex = firstTermIndex; termIndex <= lastTermIndex; ++termIndex) {
</del><ins>+ ASSERT(endIndex <= terms.size());
+ for (size_t termIndex = firstTermIndex; termIndex < endIndex; ++termIndex) {
</ins><span class="cx"> PatternTerm& term = terms[termIndex];
</span><span class="cx">
</span><span class="cx"> if (term.m_capture)
</span><span class="lines">@@ -752,7 +753,7 @@
</span><span class="cx"> if (term.type == PatternTerm::TypeParenthesesSubpattern) {
</span><span class="cx"> PatternDisjunction* nestedDisjunction = term.parentheses.disjunction;
</span><span class="cx"> for (unsigned alt = 0; alt < nestedDisjunction->m_alternatives.size(); ++alt) {
</span><del>- if (containsCapturingTerms(nestedDisjunction->m_alternatives[alt].get(), 0, nestedDisjunction->m_alternatives[alt]->m_terms.size() - 1))
</del><ins>+ if (containsCapturingTerms(nestedDisjunction->m_alternatives[alt].get(), 0, nestedDisjunction->m_alternatives[alt]->m_terms.size()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -777,7 +778,7 @@
</span><span class="cx"> if (terms.size() >= 3) {
</span><span class="cx"> bool startsWithBOL = false;
</span><span class="cx"> bool endsWithEOL = false;
</span><del>- size_t termIndex, firstExpressionTerm, lastExpressionTerm;
</del><ins>+ size_t termIndex, firstExpressionTerm;
</ins><span class="cx">
</span><span class="cx"> termIndex = 0;
</span><span class="cx"> if (terms[termIndex].type == PatternTerm::TypeAssertionBOL) {
</span><span class="lines">@@ -800,14 +801,13 @@
</span><span class="cx"> PatternTerm& lastNonAnchorTerm = terms[termIndex];
</span><span class="cx"> if ((lastNonAnchorTerm.type != PatternTerm::TypeCharacterClass) || (lastNonAnchorTerm.characterClass != m_pattern.newlineCharacterClass()) || (lastNonAnchorTerm.quantityType != QuantifierGreedy))
</span><span class="cx"> return;
</span><del>-
- lastExpressionTerm = termIndex - 1;
</del><span class="cx">
</span><del>- if (firstExpressionTerm > lastExpressionTerm)
</del><ins>+ size_t endIndex = termIndex;
+ if (firstExpressionTerm >= endIndex)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!containsCapturingTerms(alternative, firstExpressionTerm, lastExpressionTerm)) {
- for (termIndex = terms.size() - 1; termIndex > lastExpressionTerm; --termIndex)
</del><ins>+ if (!containsCapturingTerms(alternative, firstExpressionTerm, endIndex)) {
+ for (termIndex = terms.size() - 1; termIndex >= endIndex; --termIndex)
</ins><span class="cx"> terms.remove(termIndex);
</span><span class="cx">
</span><span class="cx"> for (termIndex = firstExpressionTerm; termIndex > 0; --termIndex)
</span></span></pre>
</div>
</div>
</body>
</html>