libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PARALLACTION: Don't use unsafe sprintf and vsprintf

Browse Source
This commit is contained in:
Le Philousophe 2022-10-23 15:25:52 +02:00 committed by Eugene Sandulenko
parent 19fe3f8b90
commit 9a5f51864a
7 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/parallaction/balloons.cpp
View File

@ -161,7 +161,7 @@ protected:
} else
if (token.compareToIgnoreCase("%s") == 0) {
char buf[20];
sprintf(buf, "%i", _vm->_score);
Common::sprintf_s(buf, "%i", _vm->_score);
return Common::String(buf);
}

2
engines/parallaction/debug.cpp
View File

@ -71,7 +71,7 @@ bool Debugger::Cmd_Location(int argc, const char **argv) {
case 3:
character = const_cast<char *>(argv[2]);
location = const_cast<char *>(argv[1]);
sprintf(tmp, "%s.%s", location, character);
Common::sprintf_s(tmp, "%s.%s", location, character);
_vm->scheduleLocationSwitch(tmp);
break;

4
engines/parallaction/disk_br.cpp
View File

@ -254,10 +254,6 @@ GfxObj* DosDisk_br::loadObjects(const char *name, uint8 part) {
return obj;
}
void genSlidePath(char *path, const char* name) {
sprintf(path, "%s.bmp", name);
}
GfxObj* DosDisk_br::loadStatic(const char* name) {
debugC(5, kDebugDisk, "DosDisk_br::loadStatic");
Common::SeekableReadStream *stream = openFile("ras/" + Common::String(name), ".ras");

62
engines/parallaction/disk_ns.cpp
View File

@ -260,7 +260,7 @@ Common::SeekableReadStream *DosDisk_ns::tryOpenFile(const char* name) {
return stream;
char path[PATH_LEN];
sprintf(path, "%s.pp", name);
Common::sprintf_s(path, "%s.pp", name);
return _sset.createReadStreamForMember(path);
}
@ -274,12 +274,12 @@ Script* Disk_ns::loadLocation(const char *name) {
if (!strcmp(charName, "Dinor"))
charName = "dino";
sprintf(path, "%s%s/%s.loc", charName, _language.c_str(), name);
Common::sprintf_s(path, "%s%s/%s.loc", charName, _language.c_str(), name);
debugC(3, kDebugDisk, "Disk_ns::loadLocation(%s): trying '%s'", name, path);
Common::SeekableReadStream *stream = tryOpenFile(path);
if (!stream) {
sprintf(path, "%s/%s.loc", _language.c_str(), name);
Common::sprintf_s(path, "%s/%s.loc", _language.c_str(), name);
debugC(3, kDebugDisk, "DosDisk_ns::loadLocation(%s): trying '%s'", name, path);
stream = openFile(path);
}
@ -289,7 +289,7 @@ Script* Disk_ns::loadLocation(const char *name) {
Script* Disk_ns::loadScript(const char* name) {
debugC(1, kDebugDisk, "Disk_ns::loadScript '%s'", name);
char path[PATH_LEN];
sprintf(path, "%s.script", name);
Common::sprintf_s(path, "%s.script", name);
Common::SeekableReadStream *stream = openFile(path);
return new Script(stream, true);
}
@ -339,9 +339,9 @@ GfxObj* DosDisk_ns::loadTalk(const char *name) {
char v20[30];
if (g_engineFlags & kEngineTransformedDonna) {
sprintf(v20, "%stta.cnv", name);
Common::sprintf_s(v20, "%stta.cnv", name);
} else {
sprintf(v20, "%stal.cnv", name);
Common::sprintf_s(v20, "%stal.cnv", name);
}
return new GfxObj(0, loadCnv(v20), name);
@ -350,7 +350,7 @@ GfxObj* DosDisk_ns::loadTalk(const char *name) {
GfxObj* DosDisk_ns::loadHead(const char* name) {
char path[PATH_LEN];
sprintf(path, "%shead", name);
Common::sprintf_s(path, "%shead", name);
path[8] = '\0';
Common::strcat_s(path, ".cnv");
return new GfxObj(0, loadCnv(path));
@ -359,21 +359,21 @@ GfxObj* DosDisk_ns::loadHead(const char* name) {
Frames* DosDisk_ns::loadPointer(const char *name) {
char path[PATH_LEN];
sprintf(path, "%s.cnv", name);
Common::sprintf_s(path, "%s.cnv", name);
return loadCnv(path);
}
Font* DosDisk_ns::loadFont(const char* name) {
char path[PATH_LEN];
sprintf(path, "%scnv.cnv", name);
Common::sprintf_s(path, "%scnv.cnv", name);
return createFont(name, loadCnv(path));
}
GfxObj* DosDisk_ns::loadObjects(const char *name, uint8 part) {
char path[PATH_LEN];
sprintf(path, "%sobj.cnv", name);
Common::sprintf_s(path, "%sobj.cnv", name);
return new GfxObj(0, loadCnv(path), name);
}
@ -491,13 +491,13 @@ void DosDisk_ns::loadBackground(BackgroundInfo& info, const char *filename) {
void DosDisk_ns::loadSlide(BackgroundInfo& info, const char *filename) {
char path[PATH_LEN];
sprintf(path, "%s.slide", filename);
Common::sprintf_s(path, "%s.slide", filename);
loadBackground(info, path);
}
void DosDisk_ns::loadScenery(BackgroundInfo& info, const char *name, const char *mask, const char* path) {
char filename[PATH_LEN];
sprintf(filename, "%s.dyn", name);
Common::sprintf_s(filename, "%s.dyn", name);
// load bitmap
loadBackground(info, filename);
@ -508,7 +508,7 @@ void DosDisk_ns::loadScenery(BackgroundInfo& info, const char *name, const char
// load external mask and path if present (overwriting the ones loaded by loadBackground)
char maskPath[PATH_LEN];
sprintf(maskPath, "%s.msk", mask);
Common::sprintf_s(maskPath, "%s.msk", mask);
Common::SeekableReadStream *stream = openFile(maskPath);
assert(stream);
@ -524,13 +524,13 @@ void DosDisk_ns::loadScenery(BackgroundInfo& info, const char *name, const char
Table* DosDisk_ns::loadTable(const char* name) {
char path[PATH_LEN];
sprintf(path, "%s.tab", name);
Common::sprintf_s(path, "%s.tab", name);
return createTableFromStream(100, openFile(path));
}
Common::SeekableReadStream* DosDisk_ns::loadMusic(const char* name) {
char path[PATH_LEN];
sprintf(path, "%s.mid", name);
Common::sprintf_s(path, "%s.mid", name);
return openFile(path);
}
@ -868,7 +868,7 @@ Common::SeekableReadStream *AmigaDisk_ns::tryOpenFile(const char* name) {
return stream;
char path[PATH_LEN];
sprintf(path, "%s.pp", name);
Common::sprintf_s(path, "%s.pp", name);
stream = _sset.createReadStreamForMember(path);
if (stream) {
ret = new PowerPackerStream(*stream);
@ -876,7 +876,7 @@ Common::SeekableReadStream *AmigaDisk_ns::tryOpenFile(const char* name) {
return ret;
}
sprintf(path, "%s.dd", name);
Common::sprintf_s(path, "%s.dd", name);
stream = _sset.createReadStreamForMember(path);
if (stream) {
ret = new PowerPackerStream(*stream);
@ -952,7 +952,7 @@ void AmigaDisk_ns::loadMask_internal(BackgroundInfo& info, const char *name) {
debugC(5, kDebugDisk, "AmigaDisk_ns::loadMask_internal(%s)", name);
char path[PATH_LEN];
sprintf(path, "%s.mask", name);
Common::sprintf_s(path, "%s.mask", name);
Common::SeekableReadStream *s = tryOpenFile(path);
if (!s) {
@ -984,7 +984,7 @@ void AmigaDisk_ns::loadMask_internal(BackgroundInfo& info, const char *name) {
void AmigaDisk_ns::loadPath_internal(BackgroundInfo& info, const char *name) {
char path[PATH_LEN];
sprintf(path, "%s.path", name);
Common::sprintf_s(path, "%s.path", name);
Common::SeekableReadStream *s = tryOpenFile(path);
if (!s) {
@ -1007,7 +1007,7 @@ void AmigaDisk_ns::loadScenery(BackgroundInfo& info, const char* background, con
debugC(1, kDebugDisk, "AmigaDisk_ns::loadScenery '%s', '%s'", background, mask);
char filename[PATH_LEN];
sprintf(filename, "%s.bkgnd", background);
Common::sprintf_s(filename, "%s.bkgnd", background);
loadBackground(info, filename);
@ -1032,7 +1032,7 @@ Frames* AmigaDisk_ns::loadFrames(const char* name) {
debugC(1, kDebugDisk, "AmigaDisk_ns::loadFrames '%s'", name);
char path[PATH_LEN];
sprintf(path, "anims/%s", name);
Common::sprintf_s(path, "anims/%s", name);
Common::SeekableReadStream *s = tryOpenFile(path);
if (!s)
@ -1044,7 +1044,7 @@ Frames* AmigaDisk_ns::loadFrames(const char* name) {
GfxObj* AmigaDisk_ns::loadHead(const char* name) {
debugC(1, kDebugDisk, "AmigaDisk_ns::loadHead '%s'", name);
char path[PATH_LEN];
sprintf(path, "%s.head", name);
Common::sprintf_s(path, "%s.head", name);
Common::SeekableReadStream *s = openFile(path);
return new GfxObj(0, makeCnv(s), name);
}
@ -1055,9 +1055,9 @@ GfxObj* AmigaDisk_ns::loadObjects(const char *name, uint8 part) {
char path[PATH_LEN];
if (_vm->getFeatures() & GF_DEMO)
sprintf(path, "%s.objs", name);
Common::sprintf_s(path, "%s.objs", name);
else
sprintf(path, "objs/%s.objs", name);
Common::sprintf_s(path, "objs/%s.objs", name);
Common::SeekableReadStream *s = openFile(path);
return new GfxObj(0, makeCnv(s), name);
@ -1069,9 +1069,9 @@ GfxObj* AmigaDisk_ns::loadTalk(const char *name) {
char path[PATH_LEN];
if (_vm->getFeatures() & GF_DEMO)
sprintf(path, "%s.talk", name);
Common::sprintf_s(path, "%s.talk", name);
else
sprintf(path, "talk/%s.talk", name);
Common::sprintf_s(path, "talk/%s.talk", name);
Common::SeekableReadStream *s = tryOpenFile(path);
if (!s) {
@ -1085,12 +1085,12 @@ Table* AmigaDisk_ns::loadTable(const char* name) {
char path[PATH_LEN];
if (!scumm_stricmp(name, "global")) {
sprintf(path, "%s.table", name);
Common::sprintf_s(path, "%s.table", name);
} else {
if (!(_vm->getFeatures() & GF_DEMO))
sprintf(path, "objs/%s.table", name);
Common::sprintf_s(path, "objs/%s.table", name);
else
sprintf(path, "%s.table", name);
Common::sprintf_s(path, "%s.table", name);
}
return createTableFromStream(100, openFile(path));
@ -1100,7 +1100,7 @@ Font* AmigaDisk_ns::loadFont(const char* name) {
debugC(1, kDebugDisk, "AmigaFullDisk::loadFont '%s'", name);
char path[PATH_LEN];
sprintf(path, "%sfont", name);
Common::sprintf_s(path, "%sfont", name);
Common::SeekableReadStream *stream = openFile(path);
Font *font = createFont(name, *stream);
@ -1116,7 +1116,7 @@ Common::SeekableReadStream* AmigaDisk_ns::loadMusic(const char* name) {
Common::SeekableReadStream* AmigaDisk_ns::loadSound(const char* name) {
char path[PATH_LEN];
sprintf(path, "%s.snd", name);
Common::sprintf_s(path, "%s.snd", name);
return tryOpenFile(path);
}

4
engines/parallaction/parallaction.cpp
View File

@ -947,8 +947,8 @@ void CharacterName::bind(const char *name) {
memset(_baseName, 0, 30);
strncpy(_baseName, begin, end - begin);
sprintf(_name, "%s%s", _prefix, _baseName);
sprintf(_fullName, "%s%s%s", _prefix, _baseName, _suffix);
Common::sprintf_s(_name, "%s%s", _prefix, _baseName);
Common::sprintf_s(_fullName, "%s%s%s", _prefix, _baseName, _suffix);
}
const char *CharacterName::getName() const {

24
engines/parallaction/saveload.cpp
View File

@ -45,7 +45,7 @@ Common::String SaveLoad::genSaveFileName(uint slot) {
assert(slot < NUM_SAVESLOTS || slot == SPECIAL_SAVESLOT);
char s[20];
sprintf(s, "%s.%.3u", _saveFilePrefix.c_str(), slot);
Common::sprintf_s(s, "%s.%.3u", _saveFilePrefix.c_str(), slot);
return Common::String(s);
}
@ -119,7 +119,7 @@ void SaveLoad_ns::doLoadGame(uint16 slot) {
Common::strcpy_s(_vm->_characterName1, "null");
char tmp[PATH_LEN];
sprintf(tmp, "%s.%s" , location.c_str(), character.c_str());
Common::sprintf_s(tmp, "%s.%s" , location.c_str(), character.c_str());
_vm->scheduleLocationSwitch(tmp);
}
@ -136,7 +136,7 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
memset(s, 0, sizeof(s));
if (!name || name[0] == '\0') {
sprintf(s, "default_%i", slot);
Common::sprintf_s(s, "default_%i", slot);
} else {
strncpy(s, name, 199);
}
@ -144,31 +144,31 @@ void SaveLoad_ns::doSaveGame(uint16 slot, const char* name) {
f->writeString(s);
f->writeString("\n");
sprintf(s, "%s\n", _vm->_char.getFullName());
Common::sprintf_s(s, "%s\n", _vm->_char.getFullName());
f->writeString(s);
sprintf(s, "%s\n", g_saveData1);
Common::sprintf_s(s, "%s\n", g_saveData1);
f->writeString(s);
sprintf(s, "%d\n", _vm->_char._ani->getX());
Common::sprintf_s(s, "%d\n", _vm->_char._ani->getX());
f->writeString(s);
sprintf(s, "%d\n", _vm->_char._ani->getY());
Common::sprintf_s(s, "%d\n", _vm->_char._ani->getY());
f->writeString(s);
sprintf(s, "%d\n", _vm->_score);
Common::sprintf_s(s, "%d\n", _vm->_score);
f->writeString(s);
sprintf(s, "%u\n", g_globalFlags);
Common::sprintf_s(s, "%u\n", g_globalFlags);
f->writeString(s);
sprintf(s, "%d\n", _vm->_numLocations);
Common::sprintf_s(s, "%d\n", _vm->_numLocations);
f->writeString(s);
for (uint16 _si = 0; _si < _vm->_numLocations; _si++) {
sprintf(s, "%s\n%u\n", _vm->_locationNames[_si], _vm->_localFlags[_si]);
Common::sprintf_s(s, "%s\n%u\n", _vm->_locationNames[_si], _vm->_localFlags[_si]);
f->writeString(s);
}
const InventoryItem *item;
for (uint16 _si = 0; _si < 30; _si++) {
item = _vm->getInventoryItem(_si);
sprintf(s, "%u\n%d\n", item->_id, item->_index);
Common::sprintf_s(s, "%u\n%d\n", item->_id, item->_index);
f->writeString(s);
}

2
engines/parallaction/sound.h
View File

@ -56,7 +56,7 @@ public:
virtual ~SoundMan() { delete _impl; }
void execute(int command, int32 parm) {
char n[12];
sprintf(n, "%i", parm);
Common::sprintf_s(n, "%i", parm);
execute(command, n);
}
void execute(int command, const char *parm = 0) {