diff options
| author | Eugene Sandulenko | 2007-06-06 13:35:41 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2007-06-06 13:35:41 +0000 |
| commit | 7151050fc081ab3257e925e234832f2530420791 (patch) | |
| tree | b82ed1ebc4cc48da8396bd7af5ea3a6ef8c4ace5 | |
| parent | 603ef8689426b61bf51af74ddc9258f8628ec30b (diff) | |
| download | scummvm-rg350-7151050fc081ab3257e925e234832f2530420791.tar.gz scummvm-rg350-7151050fc081ab3257e925e234832f2530420791.tar.bz2 scummvm-rg350-7151050fc081ab3257e925e234832f2530420791.zip | |
oops. MAX -> MIN to prevent memory overwrite.
svn-id: r27137
| -rw-r--r-- | engines/agi/agi_v3.cpp | 2 | ||||
| -rw-r--r-- | engines/agi/detection.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp index 142a6071ca..1e0baeaa81 100644 --- a/engines/agi/agi_v3.cpp +++ b/engines/agi/agi_v3.cpp @@ -64,7 +64,7 @@ int AgiLoader_v3::detectGame() { if (f.hasSuffix("vol.0")) { memset(_vm->_game.name, 0, 8); - strncpy(_vm->_game.name, f.c_str(), MAX((uint)8, f.size() > 5 ? f.size() - 5 : f.size())); + strncpy(_vm->_game.name, f.c_str(), MIN((uint)8, f.size() > 5 ? f.size() - 5 : f.size())); debugC(3, kDebugLevelMain, "game.name = %s", _vm->_game.name); _intVersion = 0x3149; // setup for 3.002.149 ec = _vm->v3IdGame(); diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 7b8a464ac6..ff59084ffe 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -1907,7 +1907,7 @@ Common::ADGameDescList fallbackDetector(const FSList *fslist) { for (IntMap::const_iterator f = allFiles.begin(); f != allFiles.end(); ++f) { if (f->_key.hasSuffix("vol.0")) { memset(name, 0, 8); - strncpy(name, f->_key.c_str(), MAX((uint)8, f->_key.size() > 5 ? f->_key.size() - 5 : f->_key.size())); + strncpy(name, f->_key.c_str(), MIN((uint)8, f->_key.size() > 5 ? f->_key.size() - 5 : f->_key.size())); if (allFiles.contains("object") && allFiles.contains("words.tok") && allFiles.contains(Common::String(name) + "dir")) { |