id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-03 09:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent segfault on shutdown

Browse source 
This should also happen on Windows, I'm really surprised
this hasn't been noticed there
This commit is contained in:
Daniel Gibson 2012-12-23 05:14:48 +01:00
parent ba126dde3a
commit cca3053069
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
neo/idlib/containers/StrPool.h
View file

@ -168,7 +168,23 @@ ID_INLINE void idStrPool::FreeString( const idPoolStr* poolStr )
{
int i, hash;
assert( poolStr->numUsers >= 1 );
/*
* DG: numUsers can actually be 0 when shutting down the game, because then
* first idCommonLocal::Quit() -> idCommonLocal::Shutdown() -> idLib::Shutdown()
* -> idDict::Shutdown() -> idDict::globalKeys.Clear() and idDict::globalVars.Clear()
* is called and then, from destructors,
* ~idSessionLocal() => destroy idDict titleStorageVars -> ~idDict() -> idDict::Clear()
* -> idDict::globalVars.FreeString() and idDict::globalKeys.FreeString() (this function)
* is called, leading here.
* So just return if poolStr->numUsers < 1, instead of segfaulting/asserting below
* when i == -1 because nothing was found here. As there is no nice way to find out if
* we're shutting down (at this point) just get rid of the following assertion:
* assert( poolStr->numUsers >= 1 );
*/
if( poolStr->numUsers < 1 )
return;
// DG end
assert( poolStr->pool == this );
poolStr->numUsers--;