[Scummvm-git-logs] scummvm master -> 2a310ee7e7659522576083415ad54cb8128e9223

djsrv dservilla at gmail.com
Tue Jul 21 20:22:35 UTC 2020


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:
2a310ee7e7 DIRECTOR: Fix segfault


Commit: 2a310ee7e7659522576083415ad54cb8128e9223
    https://github.com/scummvm/scummvm/commit/2a310ee7e7659522576083415ad54cb8128e9223
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-21T16:21:56-04:00

Commit Message:
DIRECTOR: Fix segfault

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index 56bace1918..9289e5191c 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -155,7 +155,7 @@ bool Channel::isMouseIn(const Common::Point &pos, bool onlyMatte) {
 		return false;
 
 	if (onlyMatte) {
-		if (_sprite->_cast->_type == kCastBitmap) {
+		if (_sprite->_cast && _sprite->_cast->_type == kCastBitmap) {
 			Graphics::Surface *matte = ((BitmapCastMember *)_sprite->_cast)->getMatte();
 			return matte ? !(*(byte *)(matte->getBasePtr(pos.x - bbox.left, pos.y - bbox.top))) : true;
 		}




More information about the Scummvm-git-logs mailing list