ensure parser has default regexp timeout, cleanup instantiation

sebastienros · Jul 29, 2023 · 260e2c6 · 260e2c6
1 parent 37988ad
commit 260e2c6
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 26 deletions.
diff --git a/Jint/Engine.cs b/Jint/Engine.cs
@@ -26,11 +26,8 @@ namespace Jint
     /// </summary>
     public sealed partial class Engine : IDisposable
     {
-        private static readonly ParserOptions _defaultParserOptions = ParserOptions.Default with
-        {
-            AllowReturnOutsideFunction = true
-        };
-        private readonly JavaScriptParser _defaultParser = new(_defaultParserOptions);
+        private readonly ParserOptions _defaultParserOptions;
+        private readonly JavaScriptParser _defaultParser;
 
         internal readonly ExecutionContextStack _executionContexts;
         private JsValue _completionValue = JsValue.Undefined;
@@ -131,6 +128,14 @@ public Engine(Action<Engine, Options> options)
 
             CallStack = new JintCallStack(Options.Constraints.MaxRecursionDepth >= 0);
             _stackGuard = new StackGuard(this);
+
+            _defaultParserOptions = ParserOptions.Default with
+            {
+                AllowReturnOutsideFunction = true,
+                RegexTimeout = Options.Constraints.RegexTimeout
+            };
+
+            _defaultParser = new JavaScriptParser(_defaultParserOptions);
         }
 
         private void Reset()

diff --git a/Jint/ModuleBuilder.cs b/Jint/ModuleBuilder.cs
@@ -20,7 +20,10 @@ internal ModuleBuilder(Engine engine, string specifier)
     {
         _engine = engine;
         _specifier = specifier;
-        _options = new ParserOptions();
+        _options = new ParserOptions
+        {
+            RegexTimeout = engine.Options.Constraints.RegexTimeout
+        };
     }
 
     public ModuleBuilder AddSource(string code)

diff --git a/Jint/Native/Function/FunctionInstance.Dynamic.cs b/Jint/Native/Function/FunctionInstance.Dynamic.cs
@@ -138,7 +138,11 @@ internal FunctionInstance CreateDynamicFunction(
                 }
             }
 
-            JavaScriptParser parser = new(new ParserOptions { Tolerant = false });
+            JavaScriptParser parser = new(new ParserOptions
+            {
+                Tolerant = false,
+                RegexTimeout = _engine.Options.Constraints.RegexTimeout
+            });
             function = (IFunction) parser.ParseScript(functionExpression, source: null, _engine._isStrict).Body[0];
         }
         catch (ParserException ex)

diff --git a/Jint/Native/RegExp/RegExpConstructor.cs b/Jint/Native/RegExp/RegExpConstructor.cs
@@ -137,21 +137,10 @@ private JsRegExp RegExpAlloc(JsValue newTarget)
 
         public JsRegExp Construct(Regex regExp, string source, string flags)
         {
-            var r = new JsRegExp(Engine);
-            r._prototype = PrototypeObject;
-
-            r.Flags = flags;
+            var r = RegExpAlloc(this);
+            r.Value = regExp;
             r.Source = source;
-
-            var timeout = _engine.Options.Constraints.RegexTimeout;
-            if (timeout.Ticks > 0)
-            {
-                r.Value = new Regex(regExp.ToString(), regExp.Options, timeout);
-            }
-            else
-            {
-                r.Value = regExp;
-            }
+            r.Flags = flags;
 
             RegExpInitialize(r);
 

diff --git a/Jint/Native/ShadowRealm/ShadowRealm.cs b/Jint/Native/ShadowRealm/ShadowRealm.cs
@@ -17,12 +17,17 @@ namespace Jint.Native.ShadowRealm;
 /// </summary>
 public sealed class ShadowRealm : ObjectInstance
 {
-    private readonly JavaScriptParser _parser = new(new ParserOptions { Tolerant = false });
+    private readonly JavaScriptParser _parser;
     internal readonly Realm _shadowRealm;
     private readonly ExecutionContext _executionContext;
 
     internal ShadowRealm(Engine engine, ExecutionContext executionContext, Realm shadowRealm) : base(engine)
     {
+        _parser = new(new ParserOptions
+        {
+            Tolerant = false,
+            RegexTimeout = engine.Options.Constraints.RegexTimeout
+        });
         _executionContext = executionContext;
         _shadowRealm = shadowRealm;
     }

diff --git a/Jint/Runtime/Interpreter/Expressions/JintLiteralExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintLiteralExpression.cs
@@ -76,12 +76,12 @@ private JsValue ResolveValue(EvaluationContext context)
             if (expression.TokenType == TokenType.RegularExpression)
             {
                 var regExpLiteral = (RegExpLiteral) _expression;
-                if (regExpLiteral.Value is not System.Text.RegularExpressions.Regex regex)
+                if (regExpLiteral.Value is System.Text.RegularExpressions.Regex regex)
                 {
-                    ExceptionHelper.ThrowSyntaxError(context.Engine.Realm, $"Unsupported regular expression: '{regExpLiteral.Regex.Pattern}/{regExpLiteral.Regex.Flags}'");
-                    return JsValue.Undefined;
+                    return context.Engine.Realm.Intrinsics.RegExp.Construct(regex, regExpLiteral.Regex.Pattern, regExpLiteral.Regex.Flags);
                 }
-                return context.Engine.Realm.Intrinsics.RegExp.Construct(regex, regExpLiteral.Regex.Pattern, regExpLiteral.Regex.Flags);
+
+                ExceptionHelper.ThrowSyntaxError(context.Engine.Realm, $"Unsupported regular expression: '{regExpLiteral.Regex.Pattern}/{regExpLiteral.Regex.Flags}'");
             }
 
             return JsValue.FromObject(context.Engine, expression.Value);