Merge prevent memory corruption in gta-streaming-five (mr-549)

9e002fd - fix(game/five): increase fwArchetypePooledMap pool size d4f5c48 - fix(game/five): prevent memory corruption in gta-streaming-five
citizenfx · Oct 14, 2024 · 1b0b6ff · 1b0b6ff
2 parents 72c2081 + 9e002fd
commit 1b0b6ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/code/components/gta-streaming-five/src/PatchStreamingPreparation.cpp b/code/components/gta-streaming-five/src/PatchStreamingPreparation.cpp
@@ -532,9 +532,12 @@ static void fwEntity_DtorWrap(rage::fwEntity* entity)
 		// to do this, we use a little hack to not have to manually read the archetype list:
 		// the base rage::fwEntity::SetModelId doesn't do anything other than setting (rcx + 32)
 		// to the resolved archetype, or nullptr if none
+		//
+		// Note: for build 3258+ - this function actually tries to do more than just setting the archetype,
+		// but if the input is initialized with zeroes - it will work as we want it to.
 		rage::fwModelId modelId(midx);
 
-		void* fakeEntity[40 / 8] = { 0 };
+		void* fakeEntity[64 / 8] = { 0 };
 		_fwEntity_SetModelId(fakeEntity, modelId);
 
 		// not the same archetype - bail out

diff --git a/data/client/citizen/common/data/gameconfig.xml b/data/client/citizen/common/data/gameconfig.xml
@@ -608,7 +608,7 @@
 						</Item>
 						<Item>
 							<PoolName>fwArchetypePooledMap</PoolName>
-							<PoolSize value="64000"/>
+							<PoolSize value="65000"/>
 						</Item>
 						<Item>
 							<PoolName>CTaskConversationHelper</PoolName>