mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Add bounds checks to room explored getter and setter

Browse source 
This means you can no longer cause Undefined Behavior by exploring a
room that is outside the array of explored room statuses.
This commit is contained in:
Misa 2021-03-24 12:14:28 -07:00 committed by Ethan Lee
parent c5e999c1d5
commit 423c79b572
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop_version/src/Map.cpp
View file

@ -724,13 +724,20 @@ int mapclass::area(int _rx, int _ry)
bool mapclass::isexplored(const int rx, const int ry) bool mapclass::isexplored(const int rx, const int ry)
{ {
const int roomnum = rx + ry*20; const int roomnum = rx + ry*20;
return explored[roomnum]; if (INBOUNDS_ARR(roomnum, explored))
{
return explored[roomnum];
}
return false;
} }
void mapclass::setexplored(const int rx, const int ry, const bool status) void mapclass::setexplored(const int rx, const int ry, const bool status)
{ {
const int roomnum = rx + ry*20; const int roomnum = rx + ry*20;
explored[roomnum] = status; if (INBOUNDS_ARR(roomnum, explored))
{
explored[roomnum] = status;
}
} }
void mapclass::exploretower(void) void mapclass::exploretower(void)