Fix out-of-bounds vector access in recompute_autotile

Astrabit-ST · Sep 15, 2023 · 8872d28 · 8872d28
1 parent e49e45d
commit 8872d28
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/tabs/map.rs b/src/tabs/map.rs
@@ -86,20 +86,21 @@ impl Tab {
                 || (x == 1 && position.0 + 1 == map.data.xsize()))
                 || ((y == -1 && position.1 == 0) || (y == 1 && position.1 + 1 == map.data.ysize()));
             // Otherwise, we only consider neighbors that are autotiles of the same type
-            let is_same_autotile = map.data[(
-                if x == -1 {
-                    position.0 - 1
-                } else {
-                    position.0 + x as usize
-                },
-                if y == -1 {
-                    position.1 - 1
-                } else {
-                    position.1 + y as usize
-                },
-                position.2,
-            )] / 48
-                == autotile;
+            let is_same_autotile = !is_out_of_bounds
+                && map.data[(
+                    if x == -1 {
+                        position.0 - 1
+                    } else {
+                        position.0 + x as usize
+                    },
+                    if y == -1 {
+                        position.1 - 1
+                    } else {
+                        position.1 + y as usize
+                    },
+                    position.2,
+                )] / 48
+                    == autotile;
 
             if is_out_of_bounds || is_same_autotile {
                 bitfield |= 1