Add bounds checking to map->isFoo() functions.

[quix0rs-blobwars.git] / src / CMap.cpp

diff --git a/src/CMap.cpp b/src/CMap.cpp
index 5fc21e9c9b207084de307cc670095e9c866b8b18..aff505b148de898d249dec8651940b04386b5b17 100644 (file)
--- a/src/CMap.cpp
+++ b/src/CMap.cpp
@@ -112,8 +112,19 @@ bool Map::isPracticeMission()
        return false;
 }
 
+bool Map::isValid(int x, int y)
+{
+       if (x >= 0 && y >= 0 && x < MAPWIDTH && y < MAPHEIGHT)
+               return true;
+
+       return false;
+}
+
 bool Map::isSolid(int x, int y)
 {
+       if (!isValid(x, y))
+               return false;
+
        if ((data[x][y] >= MAP_BREAKABLE) && (data[x][y] < MAP_DECORATION))
        {
                return true;
@@ -124,6 +135,9 @@ bool Map::isSolid(int x, int y)
 
 bool Map::isBreakable(int x, int y)
 {
+       if (!isValid(x, y))
+               return false;
+
        if ((data[x][y] >= MAP_BREAKABLE) && (data[x][y] <= MAP_BREAKABLE2))
        {
                return true;
@@ -134,6 +148,9 @@ bool Map::isBreakable(int x, int y)
 
 bool Map::isNoReset(int x, int y)
 {
+       if (!isValid(x, y))
+               return false;
+
        if ((data[x][y] >= MAP_NORESET) && (data[x][y] < MAP_DECORATION))
        {
                return true;
@@ -144,6 +161,9 @@ bool Map::isNoReset(int x, int y)
 
 bool Map::isLiquid(int x, int y)
 {
+       if (!isValid(x, y))
+               return false;
+
        if (data[x][y] == 0)
        {
                return false;
@@ -162,6 +182,9 @@ bool Map::isLiquid(int x, int y)
 
 bool Map::isTopLayer(int x, int y)
 {
+       if (!isValid(x, y))
+               return false;
+
        if (data[x][y] >= MAP_TOPLAYER)
        {
                return true;