diff options
| author | Strangerke | 2013-07-22 09:25:08 +0200 |
|---|---|---|
| committer | Strangerke | 2013-07-22 09:25:08 +0200 |
| commit | 624d05d7bce2c250016362f8af4cc27125ed67b8 (patch) | |
| tree | 8b9f54b0ca8646cf251e9dede2c89f64d1c3603a /engines/mortevielle | |
| parent | 88f5fe7329f2ee75db66c58daead78f4f4296da6 (diff) | |
| download | scummvm-rg350-624d05d7bce2c250016362f8af4cc27125ed67b8.tar.gz scummvm-rg350-624d05d7bce2c250016362f8af4cc27125ed67b8.tar.bz2 scummvm-rg350-624d05d7bce2c250016362f8af4cc27125ed67b8.zip | |
MORTEVIELLE: Fix invalid read size in music code
Diffstat (limited to 'engines/mortevielle')
| -rw-r--r-- | engines/mortevielle/mortevielle.h | 1 | ||||
| -rw-r--r-- | engines/mortevielle/utils.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 28e342cb95..5c4389483c 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -69,7 +69,6 @@ const int kAdrPictureComp = 0x7000; const int kAdrCompMusicBuf1 = 0x7414; const int kAdrCompMusicBuf2 = 0x3800; -const int kAdrUnknownBuf = 0x47a0; const int kAdrDecBuffer = 0x73A2; #define ord(v) ((int) v) diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index 1a3b1f1ec1..a23c444b2e 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -2212,8 +2212,7 @@ void MortevielleEngine::music() { if (!fic.open("mort.img")) error("Missing file - mort.img"); - fic.read(&_mem[kAdrCompMusicBuf2 * 16], 500); - fic.read(&_mem[kAdrUnknownBuf * 16], 123); + fic.read(&_mem[kAdrCompMusicBuf2 * 16], 623 * 128); fic.close(); _soundManager.decodeMusic(&_mem[kAdrCompMusicBuf2 * 16], &_mem[kAdrMusic * 16], 623); |