Fixed another exception being reported without stack trace

phxnsharp · phxnsharp · commit cb5ca36ff10b · 2020-09-10T09:10:06.000-04:00
This one happens when you use a default value on a ComVisible object, but assign an incorrect type to it.
diff --git a/ClearScript/Windows/WindowsScriptEngine.cs b/ClearScript/Windows/WindowsScriptEngine.cs
@@ -502,15 +502,15 @@ private void ThrowHostException(Exception exception)
 
         private void ThrowScriptError(Exception exception)
         {
+            if (CurrentScriptFrame.ScriptError != null || CurrentScriptFrame.PendingScriptError != null)
+            {
+                // a script error was reported; the corresponding exception should be in the script frame
+                ThrowScriptError(CurrentScriptFrame.ScriptError ?? CurrentScriptFrame.PendingScriptError);
+            }
             var comException = exception as COMException;
             if (comException != null)
             {
-                if (CurrentScriptFrame.ScriptError != null || CurrentScriptFrame.PendingScriptError != null)
-                {
-                    // a script error was reported; the corresponding exception should be in the script frame
-                    ThrowScriptError(CurrentScriptFrame.ScriptError ?? CurrentScriptFrame.PendingScriptError);
-                }
-                else if (comException.ErrorCode == HResult.CLEARSCRIPT_E_HOSTEXCEPTION)
+                if (comException.ErrorCode == HResult.CLEARSCRIPT_E_HOSTEXCEPTION)
                 {
                     // A host exception surrogate passed through the COM boundary; this happens
                     // when some script engines are invoked via script item access rather than
diff --git a/ClearScriptTest/VBScriptEngineTest.cs b/ClearScriptTest/VBScriptEngineTest.cs
@@ -490,6 +490,28 @@ public void VBScriptEngine_ExceptionDetails()
             }
         }
 
+        [TestMethod, TestCategory("VBScriptEngine")]
+        public void VBScriptEngine_ExceptionDetails2()
+        {
+            engine.AddHostObject("test", HostItemFlags.DirectAccess, new ComVisibleTestObject());
+            engine.Execute("Sub Run\ntest = \"invalid type\"\nEnd Sub");
+            try
+            {
+                engine.Invoke("Run");
+                Assert.Fail("Expected failure");
+            }
+            catch (ScriptEngineException see)
+            {
+                Assert.AreEqual(
+                    "Class doesn't support Automation: 'test'\n    at Run (Script [3]:1:0) -> test = \"invalid type\"",
+                    see.ErrorDetails, "Details message was wrong");
+            }
+            catch (Exception ex)
+            {
+                Assert.Fail("Wrong exception thrown: " + ex);
+            }
+        }
+
         [TestMethod, TestCategory("VBScriptEngine")]
         public void VBScriptEngine_AccessContext_Private()
         {
@@ -3025,6 +3047,7 @@ public T Bogus<T>(T arg)
         }
 
         [ComVisible(true)]
+        [ClassInterface(ClassInterfaceType.AutoDual)]
         public sealed class ComVisibleTestObject
         {
             public string Format(string format, object arg0 = null, object arg1 = null, object arg2 = null, object arg3 = null)
@@ -3036,6 +3059,8 @@ public T Bogus<T>(T arg)
             {
                 return default(T);
             }
+         
+            public double Value { get; set; }
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -490,6 +490,28 @@ public void VBScriptEngine_ExceptionDetails()`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`
	`493`	`+ [TestMethod, TestCategory("VBScriptEngine")]`
	`494`	`+ public void VBScriptEngine_ExceptionDetails2()`
	`495`	`+ {`
	`496`	`+ engine.AddHostObject("test", HostItemFlags.DirectAccess, new ComVisibleTestObject());`
	`497`	`+ engine.Execute("Sub Run\ntest = \"invalid type\"\nEnd Sub");`
	`498`	`+ try`
	`499`	`+ {`
	`500`	`+ engine.Invoke("Run");`
	`501`	`+ Assert.Fail("Expected failure");`
	`502`	`+ }`
	`503`	`+ catch (ScriptEngineException see)`
	`504`	`+ {`
	`505`	`+ Assert.AreEqual(`
	`506`	`+ "Class doesn't support Automation: 'test'\n at Run (Script [3]:1:0) -> test = \"invalid type\"",`
	`507`	`+ see.ErrorDetails, "Details message was wrong");`
	`508`	`+ }`
	`509`	`+ catch (Exception ex)`
	`510`	`+ {`
	`511`	`+ Assert.Fail("Wrong exception thrown: " + ex);`
	`512`	`+ }`
	`513`	`+ }`
	`514`	`+`
`493`	`515`	`[TestMethod, TestCategory("VBScriptEngine")]`
`494`	`516`	`public void VBScriptEngine_AccessContext_Private()`
`495`	`517`	`{`
`@@ -3025,6 +3047,7 @@ public T Bogus<T>(T arg)`
`3025`	`3047`	`}`
`3026`	`3048`
`3027`	`3049`	`[ComVisible(true)]`
	`3050`	`+ [ClassInterface(ClassInterfaceType.AutoDual)]`
`3028`	`3051`	`public sealed class ComVisibleTestObject`
`3029`	`3052`	`{`
`3030`	`3053`	`public string Format(string format, object arg0 = null, object arg1 = null, object arg2 = null, object arg3 = null)`
`@@ -3036,6 +3059,8 @@ public T Bogus<T>(T arg)`
`3036`	`3059`	`{`
`3037`	`3060`	`return default(T);`
`3038`	`3061`	`}`
	`3062`	`+`
	`3063`	`+ public double Value { get; set; }`
`3039`	`3064`	`}`
`3040`	`3065`
`3041`	`3066`	`#endregion`