[Scummvm-git-logs] scummvm master -> 04fb186b1be62b5a0259a5418a853e7448b28125

[rvanlaar]

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:
00e8feaaa7 DIRECTOR: fix unitialized scalar field
04fb186b1b DIRECTOR: Fix unchecked return value


Commit: 00e8feaaa7913098841517a72f050d71832ceb8d
    https://github.com/scummvm/scummvm/commit/00e8feaaa7913098841517a72f050d71832ceb8d
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-26T11:19:36+02:00

Commit Message:
DIRECTOR: fix unitialized scalar field

Initialize _nextFrame and _nextFrame counter in the debugger.

Fixes COVERITY: 1498346

Changed paths:
    engines/director/debugger.cpp


diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index 47696c2fcf5..2aceab6a9df 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -77,6 +77,8 @@ Debugger::Debugger(): GUI::Debugger() {
 	_finishCounter = 0;
 	_next = false;
 	_nextCounter = 0;
+	_nextFrame = false;
+	_nextFrameCounter = 0;
 }
 
 Debugger::~Debugger() {


Commit: 04fb186b1be62b5a0259a5418a853e7448b28125
    https://github.com/scummvm/scummvm/commit/04fb186b1be62b5a0259a5418a853e7448b28125
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-26T11:25:51+02:00

Commit Message:
DIRECTOR: Fix unchecked return value

Handle cast when PACo video file can't be opened.

COVERITY: 1476349

Changed paths:
    engines/director/lingo/xlibs/xplayanim.cpp


diff --git a/engines/director/lingo/xlibs/xplayanim.cpp b/engines/director/lingo/xlibs/xplayanim.cpp
index f656a80668c..37a3b4e8f34 100644
--- a/engines/director/lingo/xlibs/xplayanim.cpp
+++ b/engines/director/lingo/xlibs/xplayanim.cpp
@@ -55,7 +55,12 @@ void XPlayAnim::b_xplayanim(int nargs) {
 
 	debugN(5, "LB::b_xPlayAnim: x: %i y: %i", x, y);
 	Video::PacoDecoder *video = new Video::PacoDecoder();
-	video->loadFile(Common::Path(filename, g_director->_dirSeparator));
+	bool result = video->loadFile(Common::Path(filename, g_director->_dirSeparator));
+	if (!result) {
+		warning("b_xPlayAnim: PACo video not loaded: %s", filename.c_str());
+		delete video;
+		return;
+	}
 
 	// save the current palette
 	byte origPalette[256 * 3];