diff options
| author | Torbjörn Andersson | 2008-11-17 20:36:10 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2008-11-17 20:36:10 +0000 |
| commit | 0e1c4fccca1d658114730f7cb805ebf89212bd05 (patch) | |
| tree | 72cebed8822de6f2c2a0dbbd084ebb4a31420e03 /engines/scumm | |
| parent | dd14e46698af31c2522005eac59197ac0d0aa377 (diff) | |
| download | scummvm-rg350-0e1c4fccca1d658114730f7cb805ebf89212bd05.tar.gz scummvm-rg350-0e1c4fccca1d658114730f7cb805ebf89212bd05.tar.bz2 scummvm-rg350-0e1c4fccca1d658114730f7cb805ebf89212bd05.zip | |
Hopefully fixed the regression described in bug #2299682 ("FT: Crash in the intro
(regression in r34516)"), after discussing with Fingolfin. We didn't use to check
the size of the STRK chunk before, and he didn't remember why we do now, so I've
removed that test again.
svn-id: r35107
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/smush/saud_channel.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index a56afa8f44..b4c12b8553 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -62,12 +62,9 @@ bool SaudChannel::handleSubTags(int32 &offset) { break; case MKID_BE('SMRK'): _inData = false; - if (available_size >= (size + 8)) { - int32 subSize = READ_BE_UINT32((byte *)_tbuffer + offset + 4); - if (subSize != 0) - error("SMRK has an invalid size : %d", subSize); + if (available_size >= (size + 8)) _markReached = true; - } else + else return false; break; case MKID_BE('SHDR'): |