Fix crash when catching exception in managed code but native code ignores it in dotnet7

2022-12-27 13:50:38 +01:00
parent 219ad40088
commit c53bf2b7e3
1 changed files with 3 additions and 0 deletions
--- a/Source/Engine/Scripting/DotNet/MonoApi.cpp
+++ b/Source/Engine/Scripting/DotNet/MonoApi.cpp
@@ -799,6 +799,9 @@ MONO_API MONO_RT_EXTERNAL_ONLY MonoObject* mono_runtime_invoke(MonoMethod* metho
    ASSERT(methodPtr != nullptr);

    static void* InvokeMethodPtr = CoreCLR::GetStaticMethodPointer(TEXT("InvokeMethod"));
+    MonoObject* execTmp = nullptr;
+    if (!exc)
+        exc = &execTmp;
    return (MonoObject*)CoreCLR::CallStaticMethod<void*, void*, void*, void*, void*>(InvokeMethodPtr, obj, methodPtr, params, exc);
 }