In configuration settings of the Jint JS engine was added one new property - MemoryLimit (default 0)

Author: Taritsyn

src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj

@@ -6,14 +6,15 @@
 		<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-		<NoWarn>$(NoWarn);CS1591;NU5125</NoWarn>
+		<NoWarn>$(NoWarn);CS1591;NU5104;NU5125</NoWarn>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
 		<Description>JavaScriptEngineSwitcher.Jint contains adapter `JintJsEngine` (wrapper for the Jint JavaScript Engine (http://github.com/sebastienros/jint) version 3.0.0 Beta 1598).</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_Jint_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;Jint</PackageTags>
 		<PackageReleaseNotes>1. Jint was updated to version 3.0.0 Beta 1598;
-2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.</PackageReleaseNotes>
+2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3;
+3. In configuration settings of the Jint JS engine was added one new property - `MemoryLimit` (default `0`).</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

@@ -6,6 +6,7 @@
 using IOriginalCallable = Jint.Native.ICallable;
 using OriginalEngine = Jint.Engine;
 using OriginalJavaScriptException = Jint.Runtime.JavaScriptException;
+using OriginalMemoryLimitExceededException = Jint.Runtime.MemoryLimitExceededException;
 using OriginalObjectInstance = Jint.Native.Object.ObjectInstance;
 using OriginalParser = Esprima.JavaScriptParser;
 using OriginalParserException = Esprima.ParserException;
@@ -92,6 +93,7 @@ public JintJsEngine(JintSettings settings)
 				_jsEngine = new OriginalEngine(c => c
 					.AllowDebuggerStatement(jintSettings.AllowDebuggerStatement)
 					.DebugMode(jintSettings.EnableDebugging)
+					.LimitMemory(jintSettings.MemoryLimit)
 					.LimitRecursion(jintSettings.MaxRecursionDepth)
 					.LocalTimeZone(jintSettings.LocalTimeZone ?? TimeZoneInfo.Local)
 					.MaxStatements(jintSettings.MaxStatements)
@@ -244,6 +246,22 @@ private static WrapperException WrapJavaScriptException(
 			return wrapperException;
 		}
 
+		private static WrapperRuntimeException WrapMemoryLimitExceededException(
+			OriginalMemoryLimitExceededException originalMemoryException)
+		{
+			string description = originalMemoryException.Message;
+			string type = JsErrorType.Common;
+			string message = JsErrorHelpers.GenerateScriptErrorMessage(type, description, string.Empty);
+
+			var wrapperRuntimeException = new WrapperRuntimeException(message, EngineName, EngineVersion,
+				originalMemoryException)
+			{
+				Description = description
+			};
+
+			return wrapperRuntimeException;
+		}
+
 		private static WrapperRuntimeException WrapRecursionDepthOverflowException(
 			OriginalRecursionDepthOverflowException originalRecursionException)
 		{
@@ -376,6 +394,10 @@ protected override object InnerEvaluate(string expression, string documentName)
 				{
 					throw WrapJavaScriptException(e);
 				}
+				catch (OriginalMemoryLimitExceededException e)
+				{
+					throw WrapMemoryLimitExceededException(e);
+				}
 				catch (OriginalRecursionDepthOverflowException e)
 				{
 					throw WrapRecursionDepthOverflowException(e);
@@ -431,6 +453,10 @@ protected override void InnerExecute(string code, string documentName)
 				{
 					throw WrapJavaScriptException(e);
 				}
+				catch (OriginalMemoryLimitExceededException e)
+				{
+					throw WrapMemoryLimitExceededException(e);
+				}
 				catch (OriginalRecursionDepthOverflowException e)
 				{
 					throw WrapRecursionDepthOverflowException(e);
@@ -471,6 +497,10 @@ protected override void InnerExecute(IPrecompiledScript precompiledScript)
 				{
 					throw WrapJavaScriptException(e);
 				}
+				catch (OriginalMemoryLimitExceededException e)
+				{
+					throw WrapMemoryLimitExceededException(e);
+				}
 				catch (OriginalRecursionDepthOverflowException e)
 				{
 					throw WrapRecursionDepthOverflowException(e);
@@ -531,6 +561,10 @@ protected override object InnerCallFunction(string functionName, params object[]
 				{
 					throw WrapJavaScriptException(e);
 				}
+				catch (OriginalMemoryLimitExceededException e)
+				{
+					throw WrapMemoryLimitExceededException(e);
+				}
 				catch (OriginalRecursionDepthOverflowException e)
 				{
 					throw WrapRecursionDepthOverflowException(e);

src/JavaScriptEngineSwitcher.Jint/JintSettings.cs

@@ -55,6 +55,15 @@ public int MaxStatements
 			set;
 		}
 
+		/// <summary>
+		/// Gets or sets a current memory limit for a engine in bytes
+		/// </summary>
+		public long MemoryLimit
+		{
+			get;
+			set;
+		}
+
 		/// <summary>
 		/// Gets or sets a flag for whether to allow run the script in strict mode
 		/// </summary>
@@ -94,6 +103,7 @@ public JintSettings()
 			LocalTimeZone = TimeZoneInfo.Local;
 			MaxRecursionDepth = -1;
 			MaxStatements = 0;
+			MemoryLimit = 0;
 			StrictMode = false;
 			TimeoutInterval = TimeSpan.Zero;
 		}

src/JavaScriptEngineSwitcher.Jint/readme.txt

@@ -18,7 +18,9 @@
    RELEASE NOTES
    =============
    1. Jint was updated to version 3.0.0 Beta 1598;
-   2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3.
+   2. No longer supports a .NET Framework 4.0 Client and .NET Standard 1.3;
+   3. In configuration settings of the Jint JS engine was added one new property -
+      `MemoryLimit` (default `0`).
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs

@@ -177,6 +177,42 @@ public void MappingRuntimeErrorDuringExecutionOfCodeIsCorrect()
 			Assert.Empty(exception.CallStack);
 		}
 
+		[Fact]
+		public void MappingRuntimeErrorDuringOutOfMemoryIsCorrect()
+		{
+			// Arrange
+			const string input = @"var arr = [];
+
+for (var i = 0; i < 10000; i++) {
+	arr.push('Current date: ' + new Date());
+}";
+
+			JsRuntimeException exception = null;
+
+			// Act
+			using (IJsEngine jsEngine = new JintJsEngine(
+				new JintSettings
+				{
+					MemoryLimit = 2 * 1024 * 1024
+				}
+			))
+			{
+				try
+				{
+					jsEngine.Execute(input);
+				}
+				catch (JsRuntimeException e)
+				{
+					exception = e;
+				}
+			}
+
+			// Assert
+			Assert.NotNull(exception);
+			Assert.Equal("Runtime error", exception.Category);
+			Assert.Matches(@"^Script has allocated \d+ but is limited to 2097152$", exception.Description);
+		}
+
 		[Fact]
 		public void MappingRuntimeErrorDuringRecursionDepthOverflowIsCorrect()
 		{