id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert SetMaxLength() change and instead call TakeDataOwnership() to fix memory leak in InitSaveProfile()

Browse source
This commit is contained in:
Stephen Saunders 2023-11-23 21:24:22 -05:00 committed by Robert Beckebans
parent 402496411b
commit d9835cb2b4
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
neo/sys/sys_profile.cpp
View file

@ -342,15 +342,7 @@ bool idSaveGameProcessorSaveProfile::InitSaveProfile( idPlayerProfile* profile_,
// Serialize the profile and pass a file to the processor
profileFile = new( TAG_SAVEGAMES ) idFile_SaveGame( SAVEGAME_PROFILE_FILENAME, SAVEGAMEFILE_BINARY | SAVEGAMEFILE_AUTO_DELETE );
profileFile->MakeWritable();
// SRS - Use SetLength()/TruncateData() vs. SetMaxLength() to avoid setting maxSize to non-zero value
// - maxSize seems to have overloaded semantics that implies an externally-managed buffer: see
// a) idFile_Memory::idFile_Memory( const char* name, char* data, int length ), and
// b) idFile_Memory::~idFile_Memory()
// - This change avoids a leak caused by skipping internally-managed file memory cleanup in the
// idFile_Memory::~idFile_Memory() destructor (on write completion) when maxSize is non-zero
// - Note the serializer already enforces MAX_PROFILE_SIZE so file system enforcement not needed
profileFile->SetLength( MAX_PROFILE_SIZE );
profileFile->TruncateData( 0 );
profileFile->SetMaxLength( MAX_PROFILE_SIZE );
// Create a serialization object and let the game serialize the settings into the buffer
const int serializeSize = MAX_PROFILE_SIZE - 8; // -8 for checksum (all platforms) and length (on 360)
@ -368,7 +360,7 @@ bool idSaveGameProcessorSaveProfile::InitSaveProfile( idPlayerProfile* profile_,
// Add data to the file and prepare for save
profileFile->Write( msg.GetReadData(), msg.GetSize() );
profileFile->MakeReadOnly();
profileFile->TakeDataOwnership(); // SRS - this makes the file read-only and enables data buffer release
saveFileEntryList_t files;
files.Append( profileFile );