<!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>[168983] 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/168983">168983</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 15:09:51 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in JSC::Yarr::YarrGenerator<(JSC::Yarr::YarrJITCompileMode)0>::generatePatternCharacterFixed() due to WTF::CrashOnOverflow::overflowed + 9
https://bugs.webkit.org/show_bug.cgi?id=133009
Reviewed by Oliver Hunt.
If we determine that any alternative requires a minumum match size greater than
INT_MAX, we handle the match in the interpreter.
Check to see if the pattern has unsigned lengths before invoking YARR JIT.
* runtime/RegExp.cpp:
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
* tests/stress/large-regexp.js: New test added.
Set m_containsUnsignedLengthPattern flag if any alternative's minimum length
doesn't fit in an int.
* yarr/YarrPattern.cpp:
(JSC::Yarr::YarrPatternConstructor::setupDisjunctionOffsets):
Clear new m_containsUnsignedLengthPattern flag.
* yarr/YarrPattern.cpp:
(JSC::Yarr::YarrPattern::YarrPattern):
* yarr/YarrPattern.h:
(JSC::Yarr::YarrPattern::reset):
(JSC::Yarr::YarrPattern::containsUnsignedLengthPattern):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrPatterncpp">trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrPatternh">trunk/Source/JavaScriptCore/yarr/YarrPattern.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresslargeregexpjs">trunk/Source/JavaScriptCore/tests/stress/large-regexp.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168982 => 168983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-16 21:55:30 UTC (rev 168982)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-16 22:09:51 UTC (rev 168983)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-05-16 Michael Saboff <msaboff@apple.com>
+
+ Crash in JSC::Yarr::YarrGenerator<(JSC::Yarr::YarrJITCompileMode)0>::generatePatternCharacterFixed() due to WTF::CrashOnOverflow::overflowed + 9
+ https://bugs.webkit.org/show_bug.cgi?id=133009
+
+ Reviewed by Oliver Hunt.
+
+ If we determine that any alternative requires a minumum match size greater than
+ INT_MAX, we handle the match in the interpreter.
+
+ Check to see if the pattern has unsigned lengths before invoking YARR JIT.
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::compile):
+ (JSC::RegExp::compileMatchOnly):
+
+ * tests/stress/large-regexp.js: New test added.
+
+ Set m_containsUnsignedLengthPattern flag if any alternative's minimum length
+ doesn't fit in an int.
+ * yarr/YarrPattern.cpp:
+ (JSC::Yarr::YarrPatternConstructor::setupDisjunctionOffsets):
+
+ Clear new m_containsUnsignedLengthPattern flag.
+ * yarr/YarrPattern.cpp:
+ (JSC::Yarr::YarrPattern::YarrPattern):
+ * yarr/YarrPattern.h:
+ (JSC::Yarr::YarrPattern::reset):
+ (JSC::Yarr::YarrPattern::containsUnsignedLengthPattern):
+
</ins><span class="cx"> 2014-05-15 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> JSDOMWindow should not claim HasImpureGetOwnPropertySlot
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (168982 => 168983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2014-05-16 21:55:30 UTC (rev 168982)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2014-05-16 22:09:51 UTC (rev 168983)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(YARR_JIT)
</span><del>- if (!pattern.m_containsBackreferences && vm->canUseRegExpJIT()) {
</del><ins>+ if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && vm->canUseRegExpJIT()) {
</ins><span class="cx"> Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode);
</span><span class="cx"> #if ENABLE(YARR_JIT_DEBUG)
</span><span class="cx"> if (!m_regExpJITCode.isFallBack())
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(YARR_JIT)
</span><del>- if (!pattern.m_containsBackreferences && vm->canUseRegExpJIT()) {
</del><ins>+ if (!pattern.m_containsBackreferences && !pattern.containsUnsignedLengthPattern() && vm->canUseRegExpJIT()) {
</ins><span class="cx"> Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode, Yarr::MatchOnly);
</span><span class="cx"> #if ENABLE(YARR_JIT_DEBUG)
</span><span class="cx"> if (!m_regExpJITCode.isFallBack())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresslargeregexpjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/large-regexp.js (0 => 168983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/large-regexp.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/large-regexp.js 2014-05-16 22:09:51 UTC (rev 168983)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+if (''.match(/(,9111111111{2257483648,}[:lower:])|(ab)/))
+ throw new Error("Incorrect result, should not have matched")
+
+if (''.match(/(1{1,2147483648})|(ab)/))
+ throw new Error("Incorrect result, should not have matched")
+
+if (''.match(/(1{2147480000,}2{3648,})|(ab)/))
+ throw new Error("Incorrect result, should not have matched")
+
+if (!'1234'.match(/1{1,2147483645}2{1,2147483645}3{1,2147483645}4{1,2147483645}/))
+ throw new Error("Incorrect result, should have matched")
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrPatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp (168982 => 168983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp 2014-05-16 21:55:30 UTC (rev 168982)
+++ trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp 2014-05-16 22:09:51 UTC (rev 168983)
</span><span class="lines">@@ -666,6 +666,8 @@
</span><span class="cx"> minimumInputSize = std::min(minimumInputSize, alternative->m_minimumSize);
</span><span class="cx"> maximumCallFrameSize = std::max(maximumCallFrameSize, currentAlternativeCallFrameSize);
</span><span class="cx"> hasFixedSize &= alternative->m_hasFixedSize;
</span><ins>+ if (alternative->m_minimumSize > INT_MAX)
+ m_pattern.m_containsUnsignedLengthPattern = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(minimumInputSize != UINT_MAX);
</span><span class="lines">@@ -864,6 +866,7 @@
</span><span class="cx"> , m_multiline(multiline)
</span><span class="cx"> , m_containsBackreferences(false)
</span><span class="cx"> , m_containsBOL(false)
</span><ins>+ , m_containsUnsignedLengthPattern(false)
</ins><span class="cx"> , m_numSubpatterns(0)
</span><span class="cx"> , m_maxBackReference(0)
</span><span class="cx"> , newlineCached(0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrPatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrPattern.h (168982 => 168983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrPattern.h 2014-05-16 21:55:30 UTC (rev 168982)
+++ trunk/Source/JavaScriptCore/yarr/YarrPattern.h 2014-05-16 22:09:51 UTC (rev 168983)
</span><span class="lines">@@ -312,6 +312,7 @@
</span><span class="cx">
</span><span class="cx"> m_containsBackreferences = false;
</span><span class="cx"> m_containsBOL = false;
</span><ins>+ m_containsUnsignedLengthPattern = false;
</ins><span class="cx">
</span><span class="cx"> newlineCached = 0;
</span><span class="cx"> digitsCached = 0;
</span><span class="lines">@@ -330,6 +331,11 @@
</span><span class="cx"> return m_maxBackReference > m_numSubpatterns;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool containsUnsignedLengthPattern()
+ {
+ return m_containsUnsignedLengthPattern;
+ }
+
</ins><span class="cx"> CharacterClass* newlineCharacterClass()
</span><span class="cx"> {
</span><span class="cx"> if (!newlineCached)
</span><span class="lines">@@ -377,6 +383,7 @@
</span><span class="cx"> bool m_multiline : 1;
</span><span class="cx"> bool m_containsBackreferences : 1;
</span><span class="cx"> bool m_containsBOL : 1;
</span><ins>+ bool m_containsUnsignedLengthPattern : 1;
</ins><span class="cx"> unsigned m_numSubpatterns;
</span><span class="cx"> unsigned m_maxBackReference;
</span><span class="cx"> PatternDisjunction* m_body;
</span></span></pre>
</div>
</div>
</body>
</html>