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

[Strangerke]

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:
a819b91588 BAGEL: initialize variable in constructor of bmp_object (CIC 1544886)
4f4d9f1ab5 BAGEL: Fix potential null dereferencing in runObject() (CIC 1544875)


Commit: a819b91588a55ca7333c7157db8c10ead7dd051a
    https://github.com/scummvm/scummvm/commit/a819b91588a55ca7333c7157db8c10ead7dd051a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T21:48:30+01:00

Commit Message:
BAGEL: initialize variable in constructor of bmp_object (CIC 1544886)

Changed paths:
    engines/bagel/baglib/bmp_object.cpp


diff --git a/engines/bagel/baglib/bmp_object.cpp b/engines/bagel/baglib/bmp_object.cpp
index 2f0c91daa2d..c2017c7ab3e 100644
--- a/engines/bagel/baglib/bmp_object.cpp
+++ b/engines/bagel/baglib/bmp_object.cpp
@@ -27,6 +27,8 @@ namespace Bagel {
 CBagBmpObject::CBagBmpObject() : CBagObject() {
 	_xObjType = BMP_OBJ;
 	_bmp = nullptr;
+	_transparency = -1;
+
 	CBagObject::setOverCursor(1);
 	setTimeless(true);
 }


Commit: 4f4d9f1ab5885e6a161d92a18033d8f1a324a0e3
    https://github.com/scummvm/scummvm/commit/4f4d9f1ab5885e6a161d92a18033d8f1a324a0e3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T21:54:27+01:00

Commit Message:
BAGEL: Fix potential null dereferencing in runObject() (CIC 1544875)

Changed paths:
    engines/bagel/baglib/command_object.cpp


diff --git a/engines/bagel/baglib/command_object.cpp b/engines/bagel/baglib/command_object.cpp
index 8c5c62d3614..0a94843dc57 100644
--- a/engines/bagel/baglib/command_object.cpp
+++ b/engines/bagel/baglib/command_object.cpp
@@ -371,13 +371,14 @@ bool CBagCommandObject::runObject() {
 					bofPlayMovie(mainWin, smkName.getBuffer());
 					bmp.paint(mainWin, 0, 0);
 				}
-			}
 
-			// Display Credits
-			mainWin->showCreditsDialog(mainWin);
+				// Display Credits
+				mainWin->showCreditsDialog(mainWin);
+
+				// Exit the game
+				CBagel::getBagApp()->getMasterWnd()->close();
+			}
 
-			// Exit the game
-			CBagel::getBagApp()->getMasterWnd()->close();
 			g_engine->quitGame();
 
 		} else if (getFileName() == "BREAK") {