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

HDB: Replace some unsafe strcpy by strncpy

Browse source
This commit is contained in:
Strangerke 2019-09-07 00:39:06 +02:00
parent 56d4f4bff3
commit db58be617b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/hdb/saveload.cpp
View file

@ -239,7 +239,7 @@ void AIEntity::save(Common::OutSaveFile *out) {
if (!lookUp && aiAction) if (!lookUp && aiAction)
error("AIEntity::save: No matching ACTION function for func-string for %s entity", AIType2Str(type)); error("AIEntity::save: No matching ACTION function for func-string for %s entity", AIType2Str(type));
if (lookUp) if (lookUp)
strcpy(funcString, lookUp); strncpy(funcString, lookUp, 31);
out->write(funcString, 32); out->write(funcString, 32);
lookUp = g_hdb->_ai->funcLookUp(aiUse); lookUp = g_hdb->_ai->funcLookUp(aiUse);
@ -247,7 +247,7 @@ void AIEntity::save(Common::OutSaveFile *out) {
if (!lookUp && aiUse) if (!lookUp && aiUse)
error("AIEntity::save: No matching USE function for func-string for %s entity", AIType2Str(type)); error("AIEntity::save: No matching USE function for func-string for %s entity", AIType2Str(type));
if (lookUp) if (lookUp)
strcpy(funcString, lookUp); strncpy(funcString, lookUp, 31);
out->write(funcString, 32); out->write(funcString, 32);
lookUp = g_hdb->_ai->funcLookUp(aiInit); lookUp = g_hdb->_ai->funcLookUp(aiInit);
@ -255,7 +255,7 @@ void AIEntity::save(Common::OutSaveFile *out) {
if (!lookUp && aiInit) if (!lookUp && aiInit)
error("AIEntity::save: No matching INIT function for func-string for %s entity", AIType2Str(type)); error("AIEntity::save: No matching INIT function for func-string for %s entity", AIType2Str(type));
if (lookUp) if (lookUp)
strcpy(funcString, lookUp); strncpy(funcString, lookUp, 31);
out->write(funcString, 32); out->write(funcString, 32);
lookUp = g_hdb->_ai->funcLookUp(aiInit2); lookUp = g_hdb->_ai->funcLookUp(aiInit2);
@ -263,7 +263,7 @@ void AIEntity::save(Common::OutSaveFile *out) {
if (!lookUp && aiInit2) if (!lookUp && aiInit2)
error("AIEntity::save: No matching INIT2 function for func-string for %s entity", AIType2Str(type)); error("AIEntity::save: No matching INIT2 function for func-string for %s entity", AIType2Str(type));
if (lookUp) if (lookUp)
strcpy(funcString, lookUp); strncpy(funcString, lookUp, 31);
out->write(funcString, 32); out->write(funcString, 32);
lookUp = g_hdb->_ai->funcLookUp((FuncPtr)aiDraw); lookUp = g_hdb->_ai->funcLookUp((FuncPtr)aiDraw);
@ -271,7 +271,7 @@ void AIEntity::save(Common::OutSaveFile *out) {
if (!lookUp && aiDraw) if (!lookUp && aiDraw)
error("AIEntity::save: No matching DRAW function for func-string for %s entity", AIType2Str(type)); error("AIEntity::save: No matching DRAW function for func-string for %s entity", AIType2Str(type));
if (lookUp) if (lookUp)
strcpy(funcString, lookUp); strncpy(funcString, lookUp, 31);
out->write(funcString, 32); out->write(funcString, 32);
// Save AIEntity // Save AIEntity