An attempt was made to prevent occurrence of the access violation exception

Taritsyn · Taritsyn · commit b73b451b65b2 · 2017-05-31T19:45:44.000+03:00
diff --git a/NuGet/MsieJavaScriptEngine.nuspec b/NuGet/MsieJavaScriptEngine.nuspec
@@ -12,7 +12,8 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee), Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host) and jsrt-dotnet (http://github.com/robpaveza/jsrt-dotnet).</description>
 		<summary>This library is a .NET wrapper for working with the JavaScript engines of Internet Explorer and Edge (JsRT versions of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
-		<releaseNotes>Now during debugging in ActiveScript modes the script error contains a error location.</releaseNotes>
+		<releaseNotes>1. In JsRT modes fixed a problems in calculation of error locations;
+2. An attempt was made to prevent occurrence of the access violation exception.</releaseNotes>
 		<copyright>Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScript ECMAScript MSIE IE Edge Chakra</tags>
diff --git a/NuGet/readme.txt b/NuGet/readme.txt
@@ -21,8 +21,8 @@
    =============
    RELEASE NOTES
    =============
-   Now during debugging in ActiveScript modes the script error contains a error
-   location.
+   1. In JsRT modes fixed a problems in calculation of error locations;
+   2. An attempt was made to prevent occurrence of the access violation exception.
 
    ============
    PROJECT SITE
diff --git a/src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs b/src/MsieJavaScriptEngine/JsRt/Edge/ChakraEdgeJsRtJsEngine.cs
@@ -62,6 +62,7 @@ public ChakraEdgeJsRtJsEngine(bool enableDebugging)
 				{
 					_jsRuntime = CreateJsRuntime();
 					_jsContext = _jsRuntime.CreateContext();
+					_jsContext.AddRef();
 				}
 				catch (JsUsageException e)
 				{
@@ -1117,7 +1118,11 @@ protected override void Dispose(bool disposing)
 			{
 				if (_dispatcher != null)
 				{
-					_dispatcher.Invoke(() => _jsRuntime.Dispose());
+					_dispatcher.Invoke(() =>
+					{
+						_jsContext.Release();
+						_jsRuntime.Dispose();
+					});
 					_dispatcher.Dispose();
 				}
 
diff --git a/src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs b/src/MsieJavaScriptEngine/JsRt/Ie/ChakraIeJsRtJsEngine.cs
@@ -68,6 +68,7 @@ public ChakraIeJsRtJsEngine(bool enableDebugging)
 				{
 					_jsRuntime = CreateJsRuntime();
 					_jsContext = _jsRuntime.CreateContext();
+					_jsContext.AddRef();
 				}
 				catch (JsUsageException e)
 				{
@@ -1156,7 +1157,11 @@ protected override void Dispose(bool disposing)
 			{
 				if (_dispatcher != null)
 				{
-					_dispatcher.Invoke(() => _jsRuntime.Dispose());
+					_dispatcher.Invoke(() =>
+					{
+						_jsContext.Release();
+						_jsRuntime.Dispose();
+					});
 					_dispatcher.Dispose();
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public ChakraEdgeJsRtJsEngine(bool enableDebugging)`
`62`	`62`	`{`
`63`	`63`	`_jsRuntime = CreateJsRuntime();`
`64`	`64`	`_jsContext = _jsRuntime.CreateContext();`
	`65`	`+ _jsContext.AddRef();`
`65`	`66`	`}`
`66`	`67`	`catch (JsUsageException e)`
`67`	`68`	`{`
`@@ -1117,7 +1118,11 @@ protected override void Dispose(bool disposing)`
`1117`	`1118`	`{`
`1118`	`1119`	`if (_dispatcher != null)`
`1119`	`1120`	`{`
`1120`		`- _dispatcher.Invoke(() => _jsRuntime.Dispose());`
	`1121`	`+ _dispatcher.Invoke(() =>`
	`1122`	`+ {`
	`1123`	`+ _jsContext.Release();`
	`1124`	`+ _jsRuntime.Dispose();`
	`1125`	`+ });`
`1121`	`1126`	`_dispatcher.Dispose();`
`1122`	`1127`	`}`
`1123`	`1128`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public ChakraIeJsRtJsEngine(bool enableDebugging)`
`68`	`68`	`{`
`69`	`69`	`_jsRuntime = CreateJsRuntime();`
`70`	`70`	`_jsContext = _jsRuntime.CreateContext();`
	`71`	`+ _jsContext.AddRef();`
`71`	`72`	`}`
`72`	`73`	`catch (JsUsageException e)`
`73`	`74`	`{`
`@@ -1156,7 +1157,11 @@ protected override void Dispose(bool disposing)`
`1156`	`1157`	`{`
`1157`	`1158`	`if (_dispatcher != null)`
`1158`	`1159`	`{`
`1159`		`- _dispatcher.Invoke(() => _jsRuntime.Dispose());`
	`1160`	`+ _dispatcher.Invoke(() =>`
	`1161`	`+ {`
	`1162`	`+ _jsContext.Release();`
	`1163`	`+ _jsRuntime.Dispose();`
	`1164`	`+ });`
`1160`	`1165`	`_dispatcher.Dispose();`
`1161`	`1166`	`}`
`1162`	`1167`