[Scummvm-git-logs] scummvm branch-2-2 -> c463791c49cb1df0d64cf5f671f6061c20ee2f0b

[athrxx]

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:
c463791c49 KYRA: (EOB/SegaCD) - fix nullptr deref


Commit: c463791c49cb1df0d64cf5f671f6061c20ee2f0b
    https://github.com/scummvm/scummvm/commit/c463791c49cb1df0d64cf5f671f6061c20ee2f0b
Author: athrxx (athrxx at scummvm.org)
Date: 2020-09-25T21:12:18+02:00

Commit Message:
KYRA: (EOB/SegaCD) - fix nullptr deref

This would happen if ScummVM errors out before the engine is fully initialized, e. g. when the kyra.dat file is missing.

Changed paths:
    engines/kyra/sequence/sequences_eob.cpp


diff --git a/engines/kyra/sequence/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp
index f3996fe8f7..52c44bd333 100644
--- a/engines/kyra/sequence/sequences_eob.cpp
+++ b/engines/kyra/sequence/sequences_eob.cpp
@@ -2807,8 +2807,8 @@ bool EoBEngine::seq_segaPlaySequence(int sequenceId, bool setupScreen) {
 void EoBEngine::seq_segaPausePlayer(bool pause) {
 	if (_flags.platform != Common::kPlatformSegaCD)
 		return;
-
-	_seqPlayer->pause(pause);
+	if (_seqPlayer)
+		_seqPlayer->pause(pause);
 }
 
 #undef updateScrollState