In JavaScriptEngineSwitcher.ChakraCore fixed a minor errors

Author: Taritsyn

NuGet/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.nuspec

@@ -20,7 +20,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</description>
 		<summary>JavaScriptEngineSwitcher.ChakraCore contains adapter `ChakraCoreJsEngine` (wrapper for the ChakraCore).</summary>
-		<releaseNotes>ChakraCore was updated to version 1.8.2.</releaseNotes>
+		<releaseNotes>Fixed a minor errors.</releaseNotes>
 		<copyright>Copyright (c) 2013-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>JavaScriptEngineSwitcher JavaScript ECMAScript ChakraCore</tags>

NuGet/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,7 +30,7 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.8.2.
+   Fixed a minor errors.
 
    =============
    DOCUMENTATION

src/JavaScriptEngineSwitcher.ChakraCore/ChakraCoreJsEngine.cs

@@ -156,23 +156,33 @@ public ChakraCoreJsEngine(ChakraCoreSettings settings)
 			_externalObjectFinalizeCallback = ExternalObjectFinalizeCallback;
 			_promiseContinuationCallback = PromiseContinuationCallback;
 
-			_dispatcher.Invoke(() =>
+			try
 			{
-				try
+				_dispatcher.Invoke(() =>
 				{
 					_jsRuntime = JsRuntime.Create(attributes, null);
 					_jsRuntime.MemoryLimit = settings.MemoryLimit;
 
 					_jsContext = _jsRuntime.CreateContext();
-					_jsContext.AddRef();
-				}
-				catch (Exception e)
+					if (_jsContext.IsValid)
+					{
+						_jsContext.AddRef();
+					}
+				});
+			}
+			catch (Exception e)
+			{
+				throw new JsEngineLoadException(
+					string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
+						EngineName, e.Message), EngineName, EngineVersion, e);
+			}
+			finally
+			{
+				if (!_jsContext.IsValid)
 				{
-					throw new JsEngineLoadException(
-						string.Format(CoreStrings.Runtime_JsEngineNotLoaded,
-							EngineName, e.Message), EngineName, EngineVersion, e);
+					Dispose();
 				}
-			});
+			}
 		}
 
 		/// <summary>
@@ -249,8 +259,15 @@ private JsScope CreateJsScope()
 		private static void PromiseContinuationCallback(JsValue task, IntPtr callbackState)
 		{
 			task.AddRef();
-			task.CallFunction(JsValue.GlobalObject);
-			task.Release();
+
+			try
+			{
+				task.CallFunction(JsValue.GlobalObject);
+			}
+			finally
+			{
+				task.Release();
+			}
 		}
 
 		#region Mapping
@@ -1061,11 +1078,17 @@ protected override object InnerCallFunction(string functionName, params object[]
 								.Concat(processedArgs)
 								.ToArray()
 								;
-							resultValue = functionValue.CallFunction(allProcessedArgs);
 
-							foreach (JsValue processedArg in processedArgs)
+							try
 							{
-								RemoveReferenceToValue(processedArg);
+								resultValue = functionValue.CallFunction(allProcessedArgs);
+							}
+							finally
+							{
+								foreach (JsValue processedArg in processedArgs)
+								{
+									RemoveReferenceToValue(processedArg);
+								}
 							}
 						}
 						else
@@ -1160,7 +1183,16 @@ protected override void InnerSetVariableValue(string variableName, object value)
 					try
 					{
 						JsValue inputValue = MapToScriptType(value);
-						JsValue.GlobalObject.SetProperty(variableName, inputValue, true);
+						AddReferenceToValue(inputValue);
+
+						try
+						{
+							JsValue.GlobalObject.SetProperty(variableName, inputValue, true);
+						}
+						finally
+						{
+							RemoveReferenceToValue(inputValue);
+						}
 					}
 					catch (OriginalJsException e)
 					{
@@ -1264,7 +1296,10 @@ private void Dispose(bool disposing)
 				{
 					_dispatcher.Invoke(() =>
 					{
-						_jsContext.Release();
+						if (_jsContext.IsValid)
+						{
+							_jsContext.Release();
+						}
 						_jsRuntime.Dispose();
 					});
 					_dispatcher.Dispose();