<!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>[205937] 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/205937">205937</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 16:17:59 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>YARR doesn't check for invalid flags for literal regular expressions
https://bugs.webkit.org/show_bug.cgi?id=161995
Reviewed by Mark Lam.
JSTests:
New test.
* stress/regress-161995.js: Added.
(testStatic):
(catch):
Source/JavaScriptCore:
Added a new error and a check that the flags are valid when we create a
literal regular expression.
* runtime/RegExp.cpp:
(JSC::RegExp::finishCreation):
* yarr/YarrPattern.cpp:
(JSC::Yarr::YarrPattern::errorMessage):
(JSC::Yarr::YarrPattern::compile):
* yarr/YarrPattern.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<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="#trunkJSTestsstressregress161995js">trunk/JSTests/stress/regress-161995.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (205936 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-09-14 23:15:46 UTC (rev 205936)
+++ trunk/JSTests/ChangeLog 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-14 Michael Saboff <msaboff@apple.com>
+
+ YARR doesn't check for invalid flags for literal regular expressions
+ https://bugs.webkit.org/show_bug.cgi?id=161995
+
+ Reviewed by Mark Lam.
+
+ New test.
+
+ * stress/regress-161995.js: Added.
+ (testStatic):
+ (catch):
+
</ins><span class="cx"> 2016-09-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> test262: TypedArray constructors length should be 3 and configurable
</span></span></pre></div>
<a id="trunkJSTestsstressregress161995js"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/regress-161995.js (0 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regress-161995.js (rev 0)
+++ trunk/JSTests/stress/regress-161995.js 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+// Regression test for 161995.
+
+function testStatic()
+{
+ return /a/Z;
+}
+
+try {
+ testStatic();
+ throw "Expected a SyntaxEerror for bad RegExp flags, but didn't get one.";
+} catch(e) {
+ if (e != "SyntaxError: Invalid regular expression: invalid flags")
+ throw "Incorrect exception for bad RegExp flags. Got: " + e;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205936 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-14 23:15:46 UTC (rev 205936)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-14 Michael Saboff <msaboff@apple.com>
+
+ YARR doesn't check for invalid flags for literal regular expressions
+ https://bugs.webkit.org/show_bug.cgi?id=161995
+
+ Reviewed by Mark Lam.
+
+ Added a new error and a check that the flags are valid when we create a
+ literal regular expression.
+
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::finishCreation):
+ * yarr/YarrPattern.cpp:
+ (JSC::Yarr::YarrPattern::errorMessage):
+ (JSC::Yarr::YarrPattern::compile):
+ * yarr/YarrPattern.h:
+
</ins><span class="cx"> 2016-09-14 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix the Windows build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (205936 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-09-14 23:15:46 UTC (rev 205936)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm.stackLimit());
</span><del>- if (m_constructionError)
</del><ins>+ if (!isValid())
</ins><span class="cx"> m_state = ParseError;
</span><span class="cx"> else
</span><span class="cx"> m_numSubpatterns = pattern.m_numSubpatterns;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrPatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp (205936 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp 2016-09-14 23:15:46 UTC (rev 205936)
+++ trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -907,7 +907,8 @@
</span><span class="cx"> REGEXP_ERROR_PREFIX "invalid unicode {} escape",
</span><span class="cx"> REGEXP_ERROR_PREFIX "invalid escaped character for unicode pattern",
</span><span class="cx"> REGEXP_ERROR_PREFIX "too many nested disjunctions",
</span><del>- REGEXP_ERROR_PREFIX "pattern exceeds string length limits"
</del><ins>+ REGEXP_ERROR_PREFIX "pattern exceeds string length limits",
+ REGEXP_ERROR_PREFIX "invalid flags"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> return errorMessages[error];
</span><span class="lines">@@ -917,6 +918,9 @@
</span><span class="cx"> {
</span><span class="cx"> YarrPatternConstructor constructor(*this, stackLimit);
</span><span class="cx">
</span><ins>+ if (m_flags == InvalidFlags)
+ return errorMessage(InvalidRegularExpressionFlags);
+
</ins><span class="cx"> if (const char* error = parse(constructor, patternString, unicode()))
</span><span class="cx"> return error;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrPatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrPattern.h (205936 => 205937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrPattern.h 2016-09-14 23:15:46 UTC (rev 205936)
+++ trunk/Source/JavaScriptCore/yarr/YarrPattern.h 2016-09-14 23:17:59 UTC (rev 205937)
</span><span class="lines">@@ -321,6 +321,7 @@
</span><span class="cx"> InvalidIdentityEscape,
</span><span class="cx"> TooManyDisjunctions,
</span><span class="cx"> OffsetTooLarge,
</span><ins>+ InvalidRegularExpressionFlags,
</ins><span class="cx"> NumberOfErrorCodes
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>