diff options
| author | Strangerke | 2013-12-09 20:30:16 +0100 |
|---|---|---|
| committer | Strangerke | 2013-12-09 20:30:43 +0100 |
| commit | d8882bfdac397c41bf41ff6c39cf4cdbcd077bda (patch) | |
| tree | fc0c27c9750204dd6c6f70e8c44253f6d06de82e | |
| parent | 8a936200037e6d97212a4d0ad6a710c87cc15b58 (diff) | |
| download | scummvm-rg350-d8882bfdac397c41bf41ff6c39cf4cdbcd077bda.tar.gz scummvm-rg350-d8882bfdac397c41bf41ff6c39cf4cdbcd077bda.tar.bz2 scummvm-rg350-d8882bfdac397c41bf41ff6c39cf4cdbcd077bda.zip | |
TSAGE: R2R - Fix CID 1135573 - Out of bound access in scene 1337
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index adb5e7f8a8..b0f8358930 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -5074,13 +5074,11 @@ void Scene1337::subC2C2F() { for (int i = 0; i <= 3; i++) { if (tmpRandIndx != 3) { - // The variables 'i' and 'j' are not used in the inner code of the loop. - // It's understandable for 'i', which helps making sure that tmpVal is used properly, - // but it's suspect for j + // The variable 'j' is not used in the inner code of the loop, which is suspicious. + // 'i' is used indirectly to increment tmpRandIndx. for (int j = 0; j <= 7; j++) { - if ((_gameBoardSide[tmpRandIndx]._delayCard._cardId == 0) && (subC32B1(tmpRandIndx, _gameBoardSide[3]._handCard[randIndx]._cardId))) { - tmpVal = j; - } + if ((_gameBoardSide[tmpRandIndx]._delayCard._cardId == 0) && subC32B1(tmpRandIndx, _gameBoardSide[3]._handCard[randIndx]._cardId)) + tmpVal = tmpRandIndx; } } @@ -5094,7 +5092,7 @@ void Scene1337::subC2C2F() { if (tmpVal != -1) { // Useless second identical check skipped - subC3456(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[tmpVal]._delayCard); + subC3456(&_gameBoardSide[tmpVal]._handCard[randIndx], &_gameBoardSide[tmpVal]._delayCard); return; } } @@ -6908,7 +6906,6 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) { } void Scene1337::subD18F5() { - warning("subD18F5 - %d", R2_GLOBALS._v57709); if (R2_GLOBALS._v57709 == 0) R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS); @@ -6916,7 +6913,6 @@ void Scene1337::subD18F5() { } void Scene1337::subD1917() { - warning("subD1917 - %d", R2_GLOBALS._v57709); if (R2_GLOBALS._v57709 != 0) { R2_GLOBALS._v57709--; if (R2_GLOBALS._v57709 != 0) { |