Wrapper for external exceptions. Fix for #297

nilproject · Oct 22, 2023 · 49b0037 · 49b0037
1 parent 1aad724
commit 49b0037
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/NiL.JS/Core/Interop/NativeError.cs b/NiL.JS/Core/Interop/NativeError.cs
@@ -0,0 +1,13 @@
+using System;
+using NiL.JS.BaseLibrary;
+
+namespace NiL.JS.Core.Interop;
+
+public sealed class NativeError : Error
+{
+    public NativeError(string message) : base(message)
+    {
+    }
+
+    public Exception exception { get; set; }
+}
diff --git a/NiL.JS/Statements/TryCatch.cs b/NiL.JS/Statements/TryCatch.cs
@@ -6,6 +6,7 @@
 using NiL.JS.BaseLibrary;
 using NiL.JS.Core;
 using NiL.JS.Expressions;
+using NiL.JS.Core.Interop;
 
 namespace NiL.JS.Statements
 {
@@ -233,7 +234,7 @@ private void catchHandler(Context context, Exception e)
             else
 #endif
             {
-                cvar = e is JSException ? (e as JSException).Error.CloneImpl(false) : context.GlobalContext.ProxyValue(e);
+                cvar = e is JSException ? (e as JSException).Error.CloneImpl(false) : context.GlobalContext.ProxyValue(new NativeError(e.Message) { exception = e });
             }
 
             cvar._attributes |= JSValueAttributesInternal.DoNotDelete;