Fix crash with next generation graphics

Author: TheIndra55

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "vendor/catch2"]
 	path = vendor/catch2
 	url = https://github.com/catchorg/Catch2
+[submodule "vendor/jitasm"]
+	path = vendor/jitasm
+	url = https://github.com/TombRaiderModding/jitasm.git

src/modules/Patches.cpp

@@ -1,5 +1,6 @@
 #include <Hooking.Patterns.h>
 #include <MinHook.h>
+#include <jitasm.h>
 #include <thread>
 
 #include "Patches.h"
@@ -145,6 +146,9 @@ Patches::Patches()
 
 	// Fix issues with dynamic drawing when using next generation graphics
 	MH_CreateHook((void*)0x402EF0, TransToDrawVertexV4f, nullptr);
+
+	// Fix issue with some broken models in next generation graphics reading out of bounds
+	PatchDrawableHelper();
 #endif
 
 	// Patches
@@ -204,6 +208,35 @@ void Patches::PatchShadowMap() const noexcept
 
 	Hooking::Patch(match.get_first(1), m_shadowMapSize.GetValue());
 }
+
+void Patches::PatchDrawableHelper() const noexcept
+{
+	auto match = hook::pattern("05 ? ? ? ? 0F 28 08 0F 58 C1").count_hint(1);
+
+	if (match.empty())
+	{
+		return;
+	}
+
+	static struct : jitasm::Frontend
+	{
+		void InternalMain()
+		{
+			cmp(eax, 256 * 16);		// Check for overflow on pivots
+			jg("fail");
+			add(eax, 0x113F880);	// Original code
+
+			mov(edx, 0x5C136B);		// Jump to normal code
+			jmp(edx);
+
+			L("fail");
+			mov(edx, 0x5C1505);		// Jump to end of function
+			jmp(edx);
+		}
+	} stub;
+
+	Hooking::Jump(match.get_first(), stub.GetCode());
+}
 #endif
 
 #ifdef TR8

src/modules/Patches.h

@@ -57,6 +57,7 @@ class Patches : public Module
 	void RemoveIntro() const noexcept;
 	void PatchHeapSize() const noexcept;
 	void PatchShadowMap() const noexcept;
+	void PatchDrawableHelper() const noexcept;
 
 public:
 	Patches();

src/util/Hooking.cpp

@@ -30,4 +30,10 @@ void Hooking::Patch(void* address, unsigned int data) noexcept
 	memcpy(address, &data, sizeof(data));
 
 	VirtualProtect(address, sizeof(data), oldProtect, &oldProtect);
+}
+
+void Hooking::Jump(void* address, void* location)
+{
+	Patch(address, { 0xE9 });
+	Patch((void*)((char*)address + 1), (uintptr_t)location - (uintptr_t)address - 5);
 }

src/util/Hooking.h

@@ -42,6 +42,9 @@ class Hooking
 
 	// Patches data at a memory region
 	static void Patch(void* address, unsigned int data) noexcept;
+
+	// Inserts a jump at a memory region
+	static void Jump(void* address, void* location);
 };
 
 #if TR7

vendor.lua

@@ -9,6 +9,7 @@ files {
 includedirs {
     "vendor/minhook/include",
     "vendor/patterns",
+    "vendor/jitasm",
     "vendor/imgui",
     "vendor/imgui/backends"
 }