[Scummvm-git-logs] scummvm master -> 1fb57c21e0360cc3e50828ed27a3a6e1e6c4b4b8

[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:
32136a8c9e BURIED: Added sanity checks on video loading
1fb57c21e0 BURIED: Added sanity check on movie play


Commit: 32136a8c9e957a00d35fbe98996fc4a449704d3b
    https://github.com/scummvm/scummvm/commit/32136a8c9e957a00d35fbe98996fc4a449704d3b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-25T16:06:44+01:00

Commit Message:
BURIED: Added sanity checks on video loading

Changed paths:
    engines/buried/biochip_right.cpp


diff --git a/engines/buried/biochip_right.cpp b/engines/buried/biochip_right.cpp
index 4b569a2909..ac096359df 100644
--- a/engines/buried/biochip_right.cpp
+++ b/engines/buried/biochip_right.cpp
@@ -251,7 +251,9 @@ void BioChipRightWindow::onLButtonUp(const Common::Point &point, uint flags) {
 
 				VideoWindow *video = new VideoWindow(_vm, this);
 				video->setWindowPos(0, 2, 22, 0, 0, kWindowPosNoSize | kWindowPosNoZOrder | kWindowPosHideWindow);
-				video->openVideo(_vm->getFilePath(IDS_BC_CLOAKING_MOVIE_FILENAME));
+				if (!video->openVideo(_vm->getFilePath(IDS_BC_CLOAKING_MOVIE_FILENAME))) {
+					error("Failed to load cloaking video");
+				}
 				video->enableWindow(false);
 				video->showWindow(kWindowShow);
 
@@ -285,7 +287,9 @@ void BioChipRightWindow::onLButtonUp(const Common::Point &point, uint flags) {
 
 				VideoWindow *video = new VideoWindow(_vm, this);
 				video->setWindowPos(0, 2, 22, 0, 0, kWindowPosNoSize | kWindowPosNoZOrder | kWindowPosHideWindow);
-				video->openVideo(_vm->getFilePath(IDS_BC_CLOAKING_MOVIE_FILENAME));
+				if (!video->openVideo(_vm->getFilePath(IDS_BC_CLOAKING_MOVIE_FILENAME))) {
+					error("Failed to load cloaking video");
+				}
 				video->seekToFrame(24);
 				video->enableWindow(false);
 				video->showWindow(kWindowShow);


Commit: 1fb57c21e0360cc3e50828ed27a3a6e1e6c4b4b8
    https://github.com/scummvm/scummvm/commit/1fb57c21e0360cc3e50828ed27a3a6e1e6c4b4b8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-03-25T16:06:44+01:00

Commit Message:
BURIED: Added sanity check on movie play

Changed paths:
    engines/buried/scene_view.cpp


diff --git a/engines/buried/scene_view.cpp b/engines/buried/scene_view.cpp
index 87578a18e2..b8996d0ef8 100644
--- a/engines/buried/scene_view.cpp
+++ b/engines/buried/scene_view.cpp
@@ -1791,7 +1791,8 @@ bool SceneViewWindow::stopAsynchronousAnimation() {
 
 	_asyncMovie->stopVideo();
 
-	_currentScene->movieCallback(this, _asyncMovie, 0, MOVIE_STOPPED);
+	if (!_currentScene->movieCallback(this, _asyncMovie, 0, MOVIE_STOPPED))
+		return false;
 
 	delete _asyncMovie;
 	_asyncMovie = nullptr;