Fixed exceptions thrown from V8Runtime.Compile (GitHub Issue ClearFoundry#66).

ClearScriptLib · ClearScriptLib · commit ea75e470bb1f · 2018-10-04T12:10:53.000-04:00
diff --git a/ClearScript/V8/ClearScriptV8/V8Exception.cpp b/ClearScript/V8/ClearScriptV8/V8Exception.cpp
@@ -12,7 +12,8 @@ void DECLSPEC_NORETURN V8Exception::ThrowScriptEngineException() const
     auto gcEngineName = m_EngineName.ToManagedString();
     auto gcMessage = m_Message.ToManagedString();
     auto gcStackTrace = m_StackTrace.ToManagedString();
-    auto gcScriptException = ScriptEngine::Current->MarshalToHost(V8ContextProxyImpl::ExportValue(m_ScriptException), false);
+    auto gcEngine = ScriptEngine::Current;
+    auto gcScriptException = (gcEngine != nullptr) ? gcEngine->MarshalToHost(V8ContextProxyImpl::ExportValue(m_ScriptException), false) : nullptr;
     auto gcInnerException = V8ProxyHelpers::MarshalExceptionToHost(V8ContextProxyImpl::ExportValue(m_InnerException));
 
     switch (m_Type)
diff --git a/ClearScriptTest/BugFixTest.cs b/ClearScriptTest/BugFixTest.cs
@@ -1132,7 +1132,7 @@ public void BugFix_V8RuntimeConstraintScale()
         {
             const int maxNewSpaceSize = 16;
             const int maxOldSpaceSize = 512;
-			const double tolerance = .05;
+            const double tolerance = .05;
 
             var constraints = new V8RuntimeConstraints
             {
@@ -1143,10 +1143,10 @@ public void BugFix_V8RuntimeConstraintScale()
             using (var tempEngine = new V8ScriptEngine(constraints))
             {
                 Assert.AreEqual(Math.PI, tempEngine.Evaluate("Math.PI"));
-				var expected = Convert.ToDouble(maxNewSpaceSize * 2 + maxOldSpaceSize);
-				var actual = Convert.ToDouble(tempEngine.GetRuntimeHeapInfo().HeapSizeLimit / (1024 * 1024));
-				var ratio = actual / expected;
-				Assert.IsTrue((ratio >= 1 - tolerance) && (ratio <= 1 + tolerance));
+                var expected = Convert.ToDouble(maxNewSpaceSize * 2 + maxOldSpaceSize);
+                var actual = Convert.ToDouble(tempEngine.GetRuntimeHeapInfo().HeapSizeLimit / (1024 * 1024));
+                var ratio = actual / expected;
+                Assert.IsTrue((ratio >= 1 - tolerance) && (ratio <= 1 + tolerance));
             }
 
             constraints = new V8RuntimeConstraints
@@ -1158,12 +1158,12 @@ public void BugFix_V8RuntimeConstraintScale()
             using (var tempEngine = new V8ScriptEngine(constraints))
             {
                 Assert.AreEqual(Math.E, tempEngine.Evaluate("Math.E"));
-				var expected = Convert.ToDouble(maxNewSpaceSize * 2 + maxOldSpaceSize);
-				var actual = Convert.ToDouble(tempEngine.GetRuntimeHeapInfo().HeapSizeLimit / (1024 * 1024));
-				var ratio = actual / expected;
-				Assert.IsTrue((ratio >= 1 - tolerance) && (ratio <= 1 + tolerance));
-			}
-		}
+                var expected = Convert.ToDouble(maxNewSpaceSize * 2 + maxOldSpaceSize);
+                var actual = Convert.ToDouble(tempEngine.GetRuntimeHeapInfo().HeapSizeLimit / (1024 * 1024));
+                var ratio = actual / expected;
+                Assert.IsTrue((ratio >= 1 - tolerance) && (ratio <= 1 + tolerance));
+            }
+        }
 
         [TestMethod, TestCategory("BugFix")]
         public void BugFix_TooManyDebugApplications()
@@ -2357,6 +2357,15 @@ public void BugFix_JsonDotNetSerialization()
             Assert.AreEqual("{\"foo\":123,\"bar\":\"baz\"}", JsonConvert.SerializeObject(obj));
         }
 
+        [TestMethod, TestCategory("BugFix")]
+        public void BugFix_RuntimeCompileException()
+        {
+            using (var runtime = new V8Runtime())
+            {
+                TestUtil.AssertException<ScriptEngineException>(() => runtime.Compile("function foo bar () {}"));
+            }
+        }
+
         // ReSharper restore InconsistentNaming
 
         #endregion
