diff options
author | Strangerke | 2014-05-31 01:34:59 +0200 |
---|---|---|
committer | Strangerke | 2014-05-31 01:35:33 +0200 |
commit | 59d072c40cd06e28e3b6e13311a9e74043fd72a4 (patch) | |
tree | d3c7dceafe79b1b8991c05f94cf1521c614586d5 /engines/cruise/overlay.cpp | |
parent | 8cbee1509606986584625c669fc992f084036b76 (diff) | |
download | scummvm-rg350-59d072c40cd06e28e3b6e13311a9e74043fd72a4.tar.gz scummvm-rg350-59d072c40cd06e28e3b6e13311a9e74043fd72a4.tar.bz2 scummvm-rg350-59d072c40cd06e28e3b6e13311a9e74043fd72a4.zip |
CRUISE: Add safeguards to some more string manipulations
Diffstat (limited to 'engines/cruise/overlay.cpp')
-rw-r--r-- | engines/cruise/overlay.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 61df716742..d2cc0f671b 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -159,7 +159,7 @@ int loadOverlay(const char *scriptName) { return (-2); if (scriptName != overlayTable[scriptIdx].overlayName) - strcpy(overlayTable[scriptIdx].overlayName, scriptName); + Common::strlcpy(overlayTable[scriptIdx].overlayName, scriptName, sizeof(overlayTable[scriptIdx].overlayName)); overlayTable[scriptIdx].alreadyLoaded = 1; @@ -167,9 +167,8 @@ int loadOverlay(const char *scriptName) { overlayTable[scriptIdx].ovlData->scriptNumber = scriptIdx; - strcpy(fileName, scriptName); - - strcat(fileName, ".OVL"); + Common::strlcpy(fileName, scriptName, sizeof(fileName)); + Common::strlcat(fileName, ".OVL", sizeof(fileName)); debug(1, "Attempting to load overlay file %s...", fileName); @@ -550,9 +549,8 @@ int loadOverlay(const char *scriptName) { //uint8 fileName[50]; //char* unpackedBuffer; - strcpy(fileName, scriptName); - - strcat(fileName, ".FR"); + Common::strlcpy(fileName, scriptName, sizeof(fileName)); + Common::strlcat(fileName, ".FR", sizeof(fileName)); fileIdx = findFileInDisks(fileName); |