[Scummvm-cvs-logs] scummvm master -> b5c086270d7ab1cf02d3c404d5ae9818a172fad9

Strangerke Strangerke at scummvm.org
Sun Mar 16 12:02:29 CET 2014


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:
b5c086270d TSAGE: Prevent possible null dereferenced in sound player


Commit: b5c086270d7ab1cf02d3c404d5ae9818a172fad9
    https://github.com/scummvm/scummvm/commit/b5c086270d7ab1cf02d3c404d5ae9818a172fad9
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-16T12:00:39+01:00

Commit Message:
TSAGE: Prevent possible null dereferenced in sound player

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index b6434b3..c5b5474 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -1118,7 +1118,7 @@ void SoundManager::sfRethinkVoiceTypes() {
 					vse._fieldA = 1;
 					vse._sound2 = NULL;
 
-					if (total) {
+					if ((total) && vse._sound) {
 						driver->proc24(vse._channelNum, idx, vse._sound, 123, 0);
 						driver->proc24(vse._channelNum, idx, vse._sound, 1, vse._sound->_chModulation[vse._channelNum]);
 						driver->proc24(vse._channelNum, idx, vse._sound, 7,






More information about the Scummvm-git-logs mailing list