more

dotnet · Feb 18, 2024 · 12c7197 · 12c7197
1 parent 1f8b229
commit 12c7197
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSMarshalerArgument.cs b/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSMarshalerArgument.cs
@@ -79,6 +79,7 @@ public unsafe void Initialize()
             // also this is called multiple times
             JSProxyContext.JSImportWithUnknownContext();
             slot.ContextHandle = IntPtr.Zero;
+            slot.ReceiverShouldFree = false;
 #endif
         }
 
@@ -88,6 +89,7 @@ internal unsafe void InitializeWithContext(JSProxyContext knownProxyContext)
         {
             slot.Type = MarshalerType.None;
             slot.ContextHandle = knownProxyContext.ContextHandle;
+            slot.ReceiverShouldFree = false;
         }
 #endif
         // this is always called from ToManaged() marshaler

diff --git a/src/mono/browser/runtime/marshal.ts b/src/mono/browser/runtime/marshal.ts
@@ -43,6 +43,7 @@ export function is_args_exception(args: JSMarshalerArguments): boolean {
 }
 
 export function is_receiver_should_free(args: JSMarshalerArguments): boolean {
+    if (WasmEnableThreads) return false;
     mono_assert(args, "Null args");
     return getB32(<any>args + 20);
 }