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

don't use str functions with binary data, should fix bug #1845760

Browse Source 
svn-id: r29752
This commit is contained in:
Gregory Montoir 2007-12-07 23:39:19 +00:00
parent a34df6e72d
commit c0920e0224
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/scumm/sound.cpp
View File

@ -1223,13 +1223,15 @@ int ScummEngine::readSoundResource(int type, int idx) {
tmpsize = _fileHandle->readUint32BE();
// SDAT contains name of file we want
_fileHandle->read(buffer, tmpsize - 8);
// files seem to be 11 chars (8.3) unused space is replaced by spaces
*(strstr(buffer, " ")) = '\0';
_fileHandle->read(buffer, MIN(128, tmpsize - 8));
// files seem to be 11 chars (8.3)
char *p = (char *)memchr(buffer, '.', 12);
if (!p) p = &buffer[8];
strcpy(p, ".dmu");
debugC(DEBUG_SOUND, "FMUS file %s", buffer);
if (dmuFile.open(buffer) == false) {
error("Can't open music file %s*", buffer);
if (!dmuFile.open(buffer)) {
error("Can't open music file %s", buffer);
_res->roomoffs[type][idx] = (uint32)RES_INVALID_OFFSET;
return 0;
}