[Scummvm-git-logs] scummvm master -> db8298298a78d88334aaf4a726038e0eab3d02f0

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
28836aad2d DIRECTOR: Init TransParams
db8298298a DIRECTOR: Fix potential NULL dereference


Commit: 28836aad2d23ab36548cbaabd5681d1150b658ff
    https://github.com/scummvm/scummvm/commit/28836aad2d23ab36548cbaabd5681d1150b658ff
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-06T12:38:14+02:00

Commit Message:
DIRECTOR: Init TransParams

Changed paths:
    engines/director/score.h


diff --git a/engines/director/score.h b/engines/director/score.h
index 85e7e8a5f8..082319aaea 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -91,7 +91,15 @@ struct TransParams {
 	}
 
 	TransParams(uint16 d, uint16 a, uint16 c, TransitionType t) :
-		duration(d), area(a), chunkSize(c), type(t) {}
+			duration(d), area(a), chunkSize(c), type(t) {
+		frame = 0;
+		steps = 0;
+		stepDuration = 0;
+		stripSize = 0;
+
+		xStepSize = yStepSize = 0;
+		xpos = ypos = 0;
+	}
 };
 
 struct MacShape {


Commit: db8298298a78d88334aaf4a726038e0eab3d02f0
    https://github.com/scummvm/scummvm/commit/db8298298a78d88334aaf4a726038e0eab3d02f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-06T12:40:59+02:00

Commit Message:
DIRECTOR: Fix potential NULL dereference

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index d244fbb9ae..19c7423003 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -83,7 +83,7 @@ const Graphics::Surface *Channel::getMask() {
 	case kInkTypeMask: {
 		CastMember *member = g_director->getCurrentMovie()->getCastMember(_sprite->_castId + 1);
 
-		if (_sprite->_cast && member->_initialRect == _sprite->_cast->_initialRect) {
+		if (_sprite->_cast && member && member->_initialRect == _sprite->_cast->_initialRect) {
 			return &member->_widget->getSurface()->rawSurface();
 		} else {
 			warning("Channel::getMask(): Requested cast mask, but no matching mask was found");