From dfd9c393c281e31058c99bc33e209cdd2b8ee84e Mon Sep 17 00:00:00 2001 From: a/ Date: Thu, 12 Aug 2021 22:57:05 +0900 Subject: [PATCH] SAGA2: Fix buffer overflow in buildRipTables --- engines/saga2/tile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/saga2/tile.cpp b/engines/saga2/tile.cpp index 1dd15291ce8..43698d804d3 100644 --- a/engines/saga2/tile.cpp +++ b/engines/saga2/tile.cpp @@ -2742,10 +2742,10 @@ void buildRipTables(void) { // If rip table has a valid metatile, remove that meta tile's // reference to its rip table if (ripTableList[j].metaID != NoMetaTile) { - MetaTile *rip_mt = MetaTile::metaTileAddress( - ripTableList[j].metaID); + MetaTileID ripID = ripTableList[j].metaID; + MetaTile *ripMt = MetaTile::metaTileAddress(ripID); - RipTableID &rt = rip_mt->ripTableID(currentMapNum); + RipTableID &rt = ripMt->ripTableID(ripID.map); // Assign -1 to the meta tile's rip table ID if (RipTable::ripTableAddress(rt) == &ripTableList[j])