ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SHERLOCK: Fix some reads beyond script end in doScript

Browse Source
This commit is contained in:
Paul Gilbert
2015-05-08 20:41:12 -04:00
parent bf0882badc
commit 263f33a9f8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sherlock/talk.cpp
+5 -4
View File
@@ -1010,6 +1010,7 @@ void Talk::doScript(const Common::String &script) {
_savedSequences.clear();
const byte *scriptStart = (const byte *)script.c_str();
const byte *scriptEnd = scriptStart + script.size();
const byte *str = scriptStart;
if (_scriptMoreFlag) {
@@ -1577,13 +1578,13 @@ void Talk::doScript(const Common::String &script) {
++line;
// Certain different conditions require a wait
if ((line == 4 && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
(line == 5 && str[0] != PAUSE && _speaker == -1) ||
if ((line == 4 && str < scriptEnd && str[0] != SFX_COMMAND && str[0] != PAUSE && _speaker != -1) ||
(line == 5 && str < scriptEnd && str[0] != PAUSE && _speaker == -1) ||
endStr) {
wait = 1;
}
switch (str[0]) {
switch (str >= scriptEnd ? 0 : str[0]) {
case SWITCH_SPEAKER:
case ASSIGN_PORTRAIT_LOCATION:
case BANISH_WINDOW:
@@ -1631,7 +1632,7 @@ void Talk::doScript(const Common::String &script) {
}
// Clear the window unless the wait was due to a PAUSE command
if (!pauseFlag && wait != -1 && str[0] != SFX_COMMAND) {
if (!pauseFlag && wait != -1 && str < scriptEnd && str[0] != SFX_COMMAND) {
if (!_talkStealth)
ui.clearWindow();
yp = CONTROLS_Y + 12;