[Scummvm-git-logs] scummvm master -> 6b53903c9eab6c76a8856a778ed606338b7bae1a

sev- noreply at scummvm.org
Fri Feb 24 15:36:06 UTC 2023


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:
6b53903c9e DIRECTOR: Add another guard check to the external bitmap loading


Commit: 6b53903c9eab6c76a8856a778ed606338b7bae1a
    https://github.com/scummvm/scummvm/commit/6b53903c9eab6c76a8856a778ed606338b7bae1a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-24T16:35:26+01:00

Commit Message:
DIRECTOR: Add another guard check to the external bitmap loading

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 3f449a27a6d..484af9d7702 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -671,7 +671,8 @@ void Cast::loadBitmapData(int key, BitmapCastMember *bitmapCast) {
 				pic = sharedCast->getArchive()->getResource(tag, imgId);
 		}
 
-		if ((pic == nullptr || pic->size() == 0) && !_castsInfo[key]->fileName.empty()) {
+		if ((pic == nullptr || pic->size() == 0)
+				&& _castsInfo[key]->fileName && !_castsInfo[key]->fileName.empty()) {
 			// image file is linked, load from the filesystem
 			Common::File file;
 




More information about the Scummvm-git-logs mailing list