From c53bf2b7e30ec06f674f0de2359e443efa687a33 Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Tue, 27 Dec 2022 13:50:38 +0100 Subject: [PATCH] Fix crash when catching exception in managed code but native code ignores it in dotnet7 --- Source/Engine/Scripting/DotNet/MonoApi.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Engine/Scripting/DotNet/MonoApi.cpp b/Source/Engine/Scripting/DotNet/MonoApi.cpp index 4337595ba..39458f26e 100644 --- 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(InvokeMethodPtr, obj, methodPtr, params, exc); }