[Scummvm-git-logs] scummvm master -> 4f98a646700b472263c86afd1c61fdc2b6bb91cf

[stevenhoefel]

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:
4f98a64670 DIRECTOR: Don't try and play a null sound cast member.


Commit: 4f98a646700b472263c86afd1c61fdc2b6bb91cf
    https://github.com/scummvm/scummvm/commit/4f98a646700b472263c86afd1c61fdc2b6bb91cf
Author: stevenhoefel (stevenhoefel at hotmail.com)
Date: 2020-04-05T22:09:18+10:00

Commit Message:
DIRECTOR: Don't try and play a null sound cast member.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index b1f970bf7a..747022febb 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1410,7 +1410,10 @@ void LB::b_puppetSound(int nargs) {
 		sound->stopSound(1);
 	} else {
 		Cast *cast = score->_loadedCast->getVal(castId);
-		if (cast->_type != kCastSound) {
+		if (!cast) {
+			warning("b_puppetSound: attempted to play a NULL cast member");
+			return;
+		} else if (cast->_type != kCastSound) {
 			error("b_puppetSound: attempted to play a non-SoundCast cast member");
 			return;
 		}