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

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
e2afd35a4b BAGEL: MINIGAMES: Fix memory overrun in Peggleboz


Commit: e2afd35a4b9483dc712a03cfc672010f28454665
    https://github.com/scummvm/scummvm/commit/e2afd35a4b9483dc712a03cfc672010f28454665
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-26T22:45:20-07:00

Commit Message:
BAGEL: MINIGAMES: Fix memory overrun in Peggleboz

Changed paths:
    engines/bagel/hodjnpodj/peggle/game.cpp


diff --git a/engines/bagel/hodjnpodj/peggle/game.cpp b/engines/bagel/hodjnpodj/peggle/game.cpp
index c2d6fd509b8..f2fdb443cf8 100644
--- a/engines/bagel/hodjnpodj/peggle/game.cpp
+++ b/engines/bagel/hodjnpodj/peggle/game.cpp
@@ -861,12 +861,12 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint myPoint) {
 						for (i = 0; i < GRID_SIZE; i++) {
 							for (j = 0; j < GRID_SIZE; j++) {
 								if (fState[i][j] == PEGGED) {
-									if (((fState [i + 1][j] == PEGGED) && (fState [i + 2][j] == EMPTY) && (i <= 4)) ||
-									        ((fState [i - 1][j] == PEGGED) && (fState [i - 2][j] == EMPTY) && (i >= 2)) ||
-									        ((fState [i][j + 1] == PEGGED) && (fState [i][j + 2] == EMPTY) && (j <= 4)) ||
-									        ((fState [i - 1][j + 1] == PEGGED) && (fState [i - 2][j + 2] == EMPTY) && (j <= 4) && (i >= 2) && (BoardSelected == TRIANGLE || BoardSelected == TRIANGLE_PLUS)) ||
-									        ((fState [i + 1][j - 1] == PEGGED) && (fState [i + 2][j - 2] == EMPTY) && (i <= 4) && (j >= 2) && (BoardSelected == TRIANGLE || BoardSelected == TRIANGLE_PLUS)) ||
-									        ((fState [i][j - 1] == PEGGED) && (fState [i][j - 2] == EMPTY) && (j >= 2))) {
+									if (((i <= 4) && (fState [i + 1][j] == PEGGED) && (fState [i + 2][j] == EMPTY)) ||
+									        ((i >= 2) && (fState [i - 1][j] == PEGGED) && (fState [i - 2][j] == EMPTY)) ||
+									        ((j <= 4) && (fState [i][j + 1] == PEGGED) && (fState [i][j + 2] == EMPTY)) ||
+									        ((j <= 4) && (i >= 2) && (fState [i - 1][j + 1] == PEGGED) && (fState [i - 2][j + 2] == EMPTY) && (BoardSelected == TRIANGLE || BoardSelected == TRIANGLE_PLUS)) ||
+									        ((i <= 4) && (j >= 2) && (fState [i + 1][j - 1] == PEGGED) && (fState [i + 2][j - 2] == EMPTY) && (BoardSelected == TRIANGLE || BoardSelected == TRIANGLE_PLUS)) ||
+									        ((j >= 2) && (fState [i][j - 1] == PEGGED) && (fState [i][j - 2] == EMPTY))) {
 										moves_left++;
 									}
 								}