diff options
| author | Paweł Kołodziejski | 2003-01-25 20:01:23 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-01-25 20:01:23 +0000 |
| commit | 091c7089f812389c7b2d4e4e09213544001f1e34 (patch) | |
| tree | a64fa81c73871665a0b45baec9afc5a8c0405606 | |
| parent | c13e04df3d3b7f5e35dcd449954a9a12abf4ccd5 (diff) | |
| download | scummvm-rg350-091c7089f812389c7b2d4e4e09213544001f1e34.tar.gz scummvm-rg350-091c7089f812389c7b2d4e4e09213544001f1e34.tar.bz2 scummvm-rg350-091c7089f812389c7b2d4e4e09213544001f1e34.zip | |
added assert for voice samples
svn-id: r6541
| -rw-r--r-- | scumm/sound.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index d1a2e97047..185774cdd1 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1161,7 +1161,7 @@ int Sound::playBundleSound(char *sound) { return -1; } - int32 rate = 22050, channels; + int32 rate = 22050, channels, output_size = 0; int32 tag, size = -1, bits = 0; if (_scumm->_gameId == GID_CMI) { @@ -1169,17 +1169,20 @@ int Sound::playBundleSound(char *sound) { strcpy(name, sound); strcat(name, ".IMX"); ptr = (byte *)malloc(1000000); - if (_scumm->_bundle->decompressVoiceSampleByName(name, ptr) == 0) { + output_size = _scumm->_bundle->decompressVoiceSampleByName(name, ptr); + if (output_size == 0) { delete ptr; return -1; } } else { ptr = (byte *)malloc(1000000); - if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr) == 0) { + output_size = _scumm->_bundle->decompressVoiceSampleByName(sound, ptr); + if (output_size == 0) { delete ptr; return -1; } } + assert(output_size <= 1000000); tag = READ_BE_UINT32(ptr); ptr+=4; if (tag != MKID_BE('iMUS')) { |