Don't call CatchClrExceptions for JavaScriptExceptions (#1502)

sebastienros · Mar 18, 2023 · 6a838cb · 6a838cb
1 parent 98c7f0b
commit 6a838cb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/Jint.Tests/Runtime/InteropTests.cs b/Jint.Tests/Runtime/InteropTests.cs
@@ -2071,6 +2071,31 @@ public void ShouldCatchAllClrExceptions()
             Assert.Equal(engine.Invoke("throwException2").AsString(), exceptionMessage);
         }
 
+        [Fact]
+        public void ShouldNotCatchClrFromApply()
+        {
+            var engine = new Engine(options =>
+            {
+                options.CatchClrExceptions(e =>
+                {
+                    Assert.Fail("was called");
+                    return true;
+                });
+            });
+
+            engine.Execute(@"
+                function throwError() {
+                    throw new Error();
+                }
+
+                // doesn't cause ExceptionDelegateHandler call
+                try { throwError(); } catch {}
+
+                // does cause ExceptionDelegateHandler call
+                try { throwError.apply(); } catch {}
+            ");
+        }
+
         private class MemberExceptionTest
         {
             public MemberExceptionTest(bool throwOnCreate)

diff --git a/Jint/Runtime/Interop/ClrFunctionInstance.cs b/Jint/Runtime/Interop/ClrFunctionInstance.cs
@@ -37,15 +37,15 @@ protected internal override JsValue Call(JsValue thisObject, JsValue[] arguments
             {
                 return _func(thisObject, arguments);
             }
-            catch (Exception exc)
+            catch (Exception e) when (e is not JavaScriptException)
             {
-                if (_engine.Options.Interop.ExceptionHandler(exc))
+                if (_engine.Options.Interop.ExceptionHandler(e))
                 {
-                    ExceptionHelper.ThrowJavaScriptException(_realm.Intrinsics.Error, exc.Message);
+                    ExceptionHelper.ThrowJavaScriptException(_realm.Intrinsics.Error, e.Message);
                 }
                 else
                 {
-                    ExceptionDispatchInfo.Capture(exc).Throw();
+                    ExceptionDispatchInfo.Capture(e).Throw();
                 }
 
                 return Undefined;