[Scummvm-git-logs] scummvm master -> 1e1703bf374b719783a69e5c863dc5938774c06a

[sev-]

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:
1e1703bf37 DIRECTIR: LINGO: Do not crash on 'the number of castmembers' when Shared Cast is not present


Commit: 1e1703bf374b719783a69e5c863dc5938774c06a
    https://github.com/scummvm/scummvm/commit/1e1703bf374b719783a69e5c863dc5938774c06a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-23T01:23:58+02:00

Commit Message:
DIRECTIR: LINGO: Do not crash on 'the number of castmembers' when Shared Cast is not present

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 46b2fcaa89c..35ac9927462 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -390,7 +390,7 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		break;
 	case kTheCastMembers:
 		d.type = INT;
-		d.u.i = movie->getCast()->_loadedCast->size() + movie->_sharedCast->_loadedCast->size();
+		d.u.i = movie->getCast()->_loadedCast->size() + (movie->_sharedCast ? movie->_sharedCast->_loadedCast->size() : 0);
 		break;
 	case kTheCenterStage:
 		d.type = INT;