[Scummvm-git-logs] scummvm master -> 5c3c0ca6b24f9d893a4261aecc0a94a1404e67c9

[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:
77c74af34b BAGEL: Some renaming in thud, initialize _currObj pointer (CID 1544815)
5c3c0ca6b2 BAGEL: Fix a potential our of bound read in sraf_computer (CID 1544865)


Commit: 77c74af34bd359e421e5224e0ffea3466ce8302b
    https://github.com/scummvm/scummvm/commit/77c74af34bd359e421e5224e0ffea3466ce8302b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T13:27:18+01:00

Commit Message:
BAGEL: Some renaming in thud, initialize _currObj pointer (CID 1544815)

Changed paths:
    engines/bagel/spacebar/thud.cpp
    engines/bagel/spacebar/thud.h


diff --git a/engines/bagel/spacebar/thud.cpp b/engines/bagel/spacebar/thud.cpp
index fc51351b256..6460870d412 100644
--- a/engines/bagel/spacebar/thud.cpp
+++ b/engines/bagel/spacebar/thud.cpp
@@ -34,6 +34,7 @@ SBarThud::SBarThud(CBofWindow *pParent, const CBofRect &xRect) :
 	_xSDevType = SDEV_WIELD;
 	_xYouBmp = nullptr;
 	_nObjects = 0;         // This should be changed on the attach
+	_currObj = nullptr;
 }
 
 SBarThud::~SBarThud() {
diff --git a/engines/bagel/spacebar/thud.h b/engines/bagel/spacebar/thud.h
index ea07e1b6424..bcff1c96860 100644
--- a/engines/bagel/spacebar/thud.h
+++ b/engines/bagel/spacebar/thud.h
@@ -30,7 +30,7 @@ namespace SpaceBar {
 
 class SBarThud : public CBagStorageDevBmp {
 private:
-	CBagObject *pCurrObj;
+	CBagObject *_currObj;
 	int _nObjects;         // The number of currently active objects
 	CBofBitmap *_xYouBmp;
 	static int  _nThudCursor;
@@ -39,10 +39,10 @@ public:
 	virtual ~SBarThud();
 
 	CBagObject *getCurrObj() {
-		return pCurrObj;
+		return _currObj;
 	}
 	CBagObject *setCurrObj(CBagObject *pObj) {
-		return pCurrObj = pObj;
+		return _currObj = pObj;
 	}
 
 	static int      getThudCursor() {
@@ -52,18 +52,18 @@ public:
 		_nThudCursor = n;
 	}
 
-	virtual ErrorCode loadFile(const CBofString &sFile);
-	virtual ErrorCode loadFileFromStream(CBagIfstream &fpInput, const CBofString &sWldName, bool bAttach);
-	virtual bool       onObjInteraction(CBagObject *pObj, CBagStorageDev *pSDev);
+	ErrorCode loadFile(const CBofString &sFile) override;
+	ErrorCode loadFileFromStream(CBagIfstream &fpInput, const CBofString &sWldName, bool bAttach) override;
+	bool       onObjInteraction(CBagObject *pObj, CBagStorageDev *pSDev) override;
 
-	virtual ErrorCode  attach();
-	virtual ErrorCode  detach();
+	ErrorCode  attach() override;
+	ErrorCode  detach() override;
 
-	virtual ErrorCode activateLocalObject(CBagObject *pObj);
-	virtual ErrorCode deactivateLocalObject(CBagObject *pObj);
+	ErrorCode activateLocalObject(CBagObject *pObj) override;
+	ErrorCode deactivateLocalObject(CBagObject *pObj) override;
 
-	virtual ErrorCode  activateLocalObject(const CBofString &sName);
-	virtual ErrorCode  deactivateLocalObject(const CBofString &sName);
+	ErrorCode  activateLocalObject(const CBofString &sName) override;
+	ErrorCode  deactivateLocalObject(const CBofString &sName) override;
 };
 
 } // namespace SpaceBar


Commit: 5c3c0ca6b24f9d893a4261aecc0a94a1404e67c9
    https://github.com/scummvm/scummvm/commit/5c3c0ca6b24f9d893a4261aecc0a94a1404e67c9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-06T13:28:03+01:00

Commit Message:
BAGEL: Fix a potential our of bound read in sraf_computer (CID 1544865)

Changed paths:
    engines/bagel/spacebar/sraf_computer.cpp


diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 06d5343a05d..9711f45f9cf 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -3062,7 +3062,7 @@ void SrafComputer::onListAudioSettings() {
 void SrafComputer::onListRoboButler() {
 	int nSelection = _nSelection - 2;
 
-	if (nSelection < 0 || nSelection > NUM_OFFERINGS) {
+	if (nSelection < 0 || nSelection >= NUM_OFFERINGS) {
 		return;
 	}