diff options
| author | Filippos Karapetis | 2010-09-04 09:41:39 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-09-04 09:41:39 +0000 |
| commit | c34cec4e15a8edac0020ad4c6a291f960632d506 (patch) | |
| tree | 4c109c214ac0fc0e6bb63e1fd8d1d3781b3ca4dd | |
| parent | f95a2ac499171faad0bd3ce7622ef0e25dd26db7 (diff) | |
| download | scummvm-rg350-c34cec4e15a8edac0020ad4c6a291f960632d506.tar.gz scummvm-rg350-c34cec4e15a8edac0020ad4c6a291f960632d506.tar.bz2 scummvm-rg350-c34cec4e15a8edac0020ad4c6a291f960632d506.zip | |
SCI: Fixed bug #3037595 - "KQ4: Crash reading message in the bottle (whale mouth)"
svn-id: r52516
| -rw-r--r-- | engines/sci/engine/script.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 00918aec2e..ccf04f294a 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -329,11 +329,13 @@ uint16 Script::validateExportFunc(int pubfunct) { uint16 offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct); VERIFY(offset < _bufSize, "invalid export function pointer"); - if (offset == 0 && getSciVersion() <= SCI_VERSION_1_LATE) { - // Check if the game has a second export table (e.g. script 912 in Camelot). - // This only makes sense for SCI0-SCI1, as the export table in SCI1.1+ games - // is located at a specific address, thus findBlock() won't work. - // Fixes bug #3039785 + // Check if the offset found points to a second export table (e.g. script 912 + // in Camelot and script 306 in KQ4). Such offsets are usually small (i.e. < 10), + // thus easily distinguished from actual code offsets. + // This only makes sense for SCI0-SCI1, as the export table in SCI1.1+ games + // is located at a specific address, thus findBlock() won't work. + // Fixes bugs #3039785 and #3037595. + if (offset < 10 && getSciVersion() <= SCI_VERSION_1_LATE) { const uint16 *secondExportTable = (const uint16 *)findBlock(SCI_OBJ_EXPORTS, 0); if (secondExportTable) { |