thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HDB: Avoid String Buffer Overruns from Save Load Code

Browse source
This commit is contained in:
D G Turner 2019-09-14 02:27:06 +01:00
parent 817bcc4c24
commit 64e2a21a17
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/hdb/saveload.cpp
View file

@ -66,9 +66,9 @@ Common::Error HDBGame::saveGameState(int slot, const Common::String &desc) {
Graphics::saveThumbnail(*out);
_saveHeader.fileSlot = 0;
strcpy(_saveHeader.saveID, saveFileName.c_str());
Common::strlcpy(_saveHeader.saveID, saveFileName.c_str(), sizeof(_saveHeader.saveID));
_saveHeader.seconds = _timeSeconds + (_timePlayed / 1000);
strcpy(_saveHeader.mapName, _inMapName);
Common::strlcpy(_saveHeader.mapName, _inMapName, sizeof(_saveHeader.mapName));
// Actual Save Data
saveGame(out);
@ -174,7 +174,7 @@ void HDBGame::loadGame(Common::InSaveFile *in) {
g_hdb->_sound->stopMusic();
_saveHeader.seconds = _timeSeconds;
strcpy(_saveHeader.mapName, _inMapName);
Common::strlcpy(_saveHeader.mapName, _inMapName, sizeof(_saveHeader.mapName));
// Load Map Object Data
debug(1, "HDBGame::loadGame: map at %u", in->pos());