[Scummvm-git-logs] scummvm master -> 314d96a47d161a8ffc73a6e9f8e9b2ea69f7e3bd

[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:
314d96a47d BAGEL: Add a couple of safeguards to avoid null dereferencing (CID 1544849)


Commit: 314d96a47d161a8ffc73a6e9f8e9b2ea69f7e3bd
    https://github.com/scummvm/scummvm/commit/314d96a47d161a8ffc73a6e9f8e9b2ea69f7e3bd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-10T21:53:54+01:00

Commit Message:
BAGEL: Add a couple of safeguards to avoid null dereferencing (CID 1544849)

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


diff --git a/engines/bagel/baglib/rp_object.cpp b/engines/bagel/baglib/rp_object.cpp
index 06a54eef7ba..e580b578403 100644
--- a/engines/bagel/baglib/rp_object.cpp
+++ b/engines/bagel/baglib/rp_object.cpp
@@ -1336,7 +1336,6 @@ void CBagRPObject::restoreResiduePrintedVars() {
 
 // Hide the list of rp results, don't purge them from memory, just set to not visible.
 void CBagRPObject::hideResiduePrintedReview() {
-	CBagRPObject *pRPObj;
 	CBagLog *pLogWld;
 
 	if (zoomed()) {
@@ -1345,7 +1344,7 @@ void CBagRPObject::hideResiduePrintedReview() {
 		pLogWld = (CBagLog *)g_SDevManager->getStorageDevice(LOG_WLD);
 	}
 
-	pRPObj = _pRPList->getNodeItem(0);
+	CBagRPObject *pRPObj = _pRPList->getNodeItem(0);
 	if (pRPObj == nullptr) {
 		return;
 	}
@@ -1356,8 +1355,14 @@ void CBagRPObject::hideResiduePrintedReview() {
 	for (int i = 0; i < nCount; i++) {
 		pRPObj = _pRPList->getNodeItem(i);
 
+		if (!pRPObj)
+			error("hideResiduePrintedReview() - Unexpected null pRPObj");
+		
 		// If the object txt var is not found yet, then get it.
 		if (pRPObj->_pObjectName == nullptr) {
+			if (!pLogWld)
+				error("hideResiduePrintedReview() - Unexpected null pLogWld");
+
 			pRPObj->_pObjectName = (CBagTextObject *)pLogWld->getObject(pRPObj->_sObjectName);
 		}