R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

RTech: fix resource leak

Browse Source 
CustomPakData_t::numHandles was never decremented on unload, causing pakId == PAK_INVALID_HANDLE to be true and triggering the assert. Due to this, we either never unload resources properly on subsequent unloads and loads, or we would run out of pak slots as numHandles will reach MAX_CUSTOM_PAKS. Also added a comment explaining why this loop isn't ran in reverse.
This commit is contained in:
Kawe Mazidjatari 2024-11-08 21:51:04 +01:00
parent a6a4e76677
commit d0ec49cc52
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/engine/cmodel_bsp.cpp
View File

@ -61,19 +61,17 @@ void CustomPakData_t::UnloadAndRemoveAll()
{
// Base SDK paks should not be unloaded here, but only right before base
// engine paks are unloaded. Only unload user requested and level settings
// paks from here.
for (size_t i = CustomPakData_t::PAK_TYPE_COUNT; i < numHandles; i++)
// paks from here. Also, ideally this loop runs in reverse, but the engine
// does not support that as it would crash when paks are unloaded that way.
for (size_t i = CustomPakData_t::PAK_TYPE_COUNT, n = numHandles; i < n; i++)
{
const PakHandle_t pakId = handles[i];
if (pakId == PAK_INVALID_HANDLE)
{
assert(0); // invalid handles should not be inserted
return;
}
assert(pakId != PAK_INVALID_HANDLE); // invalid handles should not be inserted
g_pakLoadApi->UnloadAsync(pakId);
handles[i] = PAK_INVALID_HANDLE;
numHandles--;
}
}