Merge remote-tracking branch 'blattersturm/fix/client-rpc-seh' into m…

…aster-pub
citizenfx · Aug 15, 2021 · 503f215 · 503f215
2 parents b909e91 + e6e627e
commit 503f215
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/code/components/gta-net-five/src/ClientRPC.cpp b/code/components/gta-net-five/src/ClientRPC.cpp
@@ -28,6 +28,33 @@ extern NetLibrary* g_netLibrary;
 
 #include <concurrentqueue.h>
 
+static LONG ShouldHandleUnwind(DWORD exceptionCode, uint64_t identifier)
+{
+	// C++ exceptions?
+	if (exceptionCode == 0xE06D7363)
+	{
+		return EXCEPTION_CONTINUE_SEARCH;
+	}
+
+	return EXCEPTION_EXECUTE_HANDLER;
+}
+
+template<typename THandler, typename TContext>
+static inline void CallHandler(const THandler& handler, uint64_t nativeIdentifier, TContext& context)
+{
+	// call the original function
+	static void* exceptionAddress;
+
+	__try
+	{
+		handler(context);
+	}
+	__except (exceptionAddress = (GetExceptionInformation())->ExceptionRecord->ExceptionAddress, ShouldHandleUnwind((GetExceptionInformation())->ExceptionRecord->ExceptionCode, nativeIdentifier))
+	{
+		throw std::exception(va("Error executing native 0x%016llx at address %p.", nativeIdentifier, exceptionAddress));
+	}
+}
+
 class FxNativeInvoke
 {
 private:
@@ -539,7 +566,7 @@ static InitFunction initFunction([]()
 							{
 								try
 								{
-									(*n)(*executionCtx);
+									CallHandler(*n, nativeHash, *executionCtx);
 								}
 								catch (std::exception& e)
 								{