[Scummvm-git-logs] scummvm master -> e39a63c5e5609d9f38be6c8ffdd58e5dd56cd8dd

djsrv dservilla at gmail.com
Wed Jul 28 03:32:34 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e39a63c5e5 DIRECTOR: Fix submenu bounds check


Commit: e39a63c5e5609d9f38be6c8ffdd58e5dd56cd8dd
    https://github.com/scummvm/scummvm/commit/e39a63c5e5609d9f38be6c8ffdd58e5dd56cd8dd
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-27T23:10:34-04:00

Commit Message:
DIRECTOR: Fix submenu bounds check

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index c14bb633cb..816e29255c 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -333,7 +333,7 @@ void DirectorSound::playExternalSound(uint16 menu, uint16 submenu, uint8 soundCh
 	if (!_sampleSounds.contains(menu))
 		loadSampleSounds(menu);
 
-	if ((uint)submenu<= _sampleSounds[menu].size()) {
+	if (1 <= submenu && submenu <= _sampleSounds[menu].size()) {
 		playStream(*(_sampleSounds[menu][submenu - 1]->getAudioStream()), soundChannel);
 		setLastPlaySound(soundChannel, soundId);
 	} else {




More information about the Scummvm-git-logs mailing list