[Scummvm-git-logs] scummvm master -> f43eb286de1fb3f9439b42a9c101220cf4fb46fc

[Strangerke]

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:
f43eb286de BAGEL: Add a check to avoid a potential null dereferencing (CID 1544863)


Commit: f43eb286de1fb3f9439b42a9c101220cf4fb46fc
    https://github.com/scummvm/scummvm/commit/f43eb286de1fb3f9439b42a9c101220cf4fb46fc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-17T22:28:09+01:00

Commit Message:
BAGEL: Add a check to avoid a potential null dereferencing (CID 1544863)

Changed paths:
    engines/bagel/dialogs/opt_window.cpp


diff --git a/engines/bagel/dialogs/opt_window.cpp b/engines/bagel/dialogs/opt_window.cpp
index 688a315af02..caf5b798950 100644
--- a/engines/bagel/dialogs/opt_window.cpp
+++ b/engines/bagel/dialogs/opt_window.cpp
@@ -188,10 +188,13 @@ void CBagOptWindow::onPaint(CBofRect *pRect) {
 ErrorCode CBagOptWindow::attach() {
 	// Save off the current game's palette
 	_pSavePalette = CBofApp::getApp()->getPalette();
+	CBofPalette *pPal = nullptr;
 
 	// Insert ours
-	CBofPalette *pPal = _pBackdrop->getPalette();
-	CBofApp::getApp()->setPalette(pPal);
+	if (_pBackdrop != nullptr) {
+		pPal = _pBackdrop->getPalette();
+		CBofApp::getApp()->setPalette(pPal);
+	}
 
 	// Paint stuff
 	if (_pBackdrop != nullptr) {