Merge Add heap corruption checking (mr-587)

8a8c141 - feat(game): add heap corruption checking
citizenfx · Nov 19, 2024 · 8a6a363 · 8a6a363
2 parents 785035d + 8a8c141
commit 8a6a363
Show file tree

Hide file tree

Showing 7 changed files with 540 additions and 66 deletions.
diff --git a/code/client/shared/atPool.h b/code/client/shared/atPool.h
@@ -1,5 +1,6 @@
 #pragma once
 
+// Actually fwBasePool
 class atPoolBase
 {
 protected:

diff --git a/code/components/gta-core-five/component.lua b/code/components/gta-core-five/component.lua
@@ -3,7 +3,8 @@ return function()
 
 	links 'CitiCore'
 	files {
-		'components/gta-core-rdr3/src/ErrorHandler.cpp'
+		'components/gta-core-rdr3/src/ErrorHandler.cpp',
+		'components/gta-core-rdr3/src/SimpleAllocator.cpp'
 	}
 	add_dependencies { 'vendor:eastl' }
 end
diff --git a/code/components/gta-core-five/src/GameSkeleton.cpp b/code/components/gta-core-five/src/GameSkeleton.cpp
@@ -9,6 +9,8 @@
 #include <ICoreGameInit.h>
 #include <CrossBuildRuntime.h>
 
+extern void ValidateHeaps();
+
 static std::unordered_map<uint32_t, std::string> g_initFunctionNames;
 
 namespace rage
@@ -95,6 +97,8 @@ namespace rage
 
 	void gameSkeleton::RunInitFunctions(InitFunctionType type)
 	{
+		ValidateHeaps();
+
 		trace(__FUNCTION__ ": Running %s init functions\n", InitFunctionTypeToString(type));
 
 		OnInitFunctionStart(type);
@@ -112,6 +116,8 @@ namespace rage
 
 					for (int index : entry->functions)
 					{
+						ValidateHeaps();
+
 						auto func = m_initFunctions[index];
 
 						if (OnInitFunctionInvoking(type, i, func))
@@ -130,6 +136,8 @@ namespace rage
 						OnInitFunctionInvoked(type, func);
 
 						++i;
+
+						ValidateHeaps();
 					}
 
 					OnInitFunctionEndOrder(type, entry->order);
@@ -139,6 +147,8 @@ namespace rage
 
 		OnInitFunctionEnd(type);
 
+		ValidateHeaps();
+
 		trace(__FUNCTION__ ": Done running %s init functions!\n", InitFunctionTypeToString(type));
 	}
 

diff --git a/code/components/gta-core-rdr3/src/GameSkeleton.cpp b/code/components/gta-core-rdr3/src/GameSkeleton.cpp
@@ -8,6 +8,8 @@
 
 #include <ICoreGameInit.h>
 
+extern void ValidateHeaps();
+
 static std::unordered_map<uint32_t, std::string> g_initFunctionNames;
 
 // rage::strStreamingEngine::ms_bIsPerformingAsyncInit
@@ -88,6 +90,8 @@ namespace rage
 
 	void gameSkeleton::RunInitFunctions(InitFunctionType type)
 	{
+		ValidateHeaps();
+
 		trace(__FUNCTION__ ": Running %s init functions\n", InitFunctionTypeToString(type));
 
 		OnInitFunctionStart(type);
@@ -109,6 +113,8 @@ namespace rage
 					{
 						for (int index : entry->functions)
 						{
+							ValidateHeaps();
+
 							auto func = m_initFunctions[index];
 
 							bool isAsync = (func.asyncInitMask & type) != 0;
@@ -134,6 +140,8 @@ namespace rage
 							OnInitFunctionInvoked(type, func);
 
 							++i;
+
+							ValidateHeaps();
 						}
 					}
 
@@ -146,6 +154,8 @@ namespace rage
 
 		OnInitFunctionEnd(type);
 
+		ValidateHeaps();
+
 		trace(__FUNCTION__ ": Done running %s init functions!\n", InitFunctionTypeToString(type));
 	}