[Scummvm-git-logs] scummvm master -> 4b070faa3463b70ae3979f4a607c4f8c7a038ece

[sev-]

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:
4b070faa34 DIRECTOR: XTRAS: Do not crash on invalid QTVR movies


Commit: 4b070faa3463b70ae3979f4a607c4f8c7a038ece
    https://github.com/scummvm/scummvm/commit/4b070faa3463b70ae3979f4a607c4f8c7a038ece
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-20T12:45:14+01:00

Commit Message:
DIRECTOR: XTRAS: Do not crash on invalid QTVR movies

Changed paths:
    engines/director/lingo/xtras/qtvrxtra.cpp


diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index 04b6e166747..8fcbd43ef15 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -441,6 +441,9 @@ void QtvrxtraXtra::m_QTVRIdle(int nargs) {
 
 	Graphics::Surface const *frame = me->_video->decodeNextFrame();
 
+	if (!frame)
+		return;
+
 	Graphics::Surface *dither = frame->convertTo(g_director->_wm->_pixelformat, me->_video->getPalette(), 256, g_director->getPalette(), 256, Graphics::kDitherNaive);
 
 	g_director->getCurrentWindow()->getSurface()->copyRectToSurface(
@@ -558,6 +561,11 @@ void QtvrxtraXtra::m_QTVRMouseOver(int nargs) {
 	while (true) {
 		Graphics::Surface const *frame = me->_video->decodeNextFrame();
 
+		if (!frame) {
+			g_lingo->pushVoid();
+			return;
+		}
+
 		Graphics::Surface *dither = frame->convertTo(g_director->_wm->_pixelformat, me->_video->getPalette(), 256, g_director->getPalette(), 256, Graphics::kDitherNaive);
 
 		g_director->getCurrentWindow()->getSurface()->copyRectToSurface(