Fix out of bound crash

Gigoteur · May 26, 2017 · 7f34f58 · johnbatty · May 26, 2017 · hallucino
1 parent a2a7ab1
commit 7f34f58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/gfx/mod.rs b/src/gfx/mod.rs
@@ -499,6 +499,9 @@ impl Screen {
     }
 
     pub fn putpixel_direct(&mut self, x: i32, y: i32, col: u32) {
+        if x >= px8::SCREEN_WIDTH as i32 || y >= px8::SCREEN_HEIGHT as i32 {
+            return;
+        }
         self.back_buffer[Screen::pixel_offset(x, y)] = col as u8;
     }
 
@@ -513,6 +516,10 @@ impl Screen {
             return;
         };
 
+        if x >= px8::SCREEN_WIDTH as i32 || y >= px8::SCREEN_HEIGHT as i32 {
+            return;
+        }
+
         let draw_col = self.color_map[(col & 0xFF) as usize];
 
         self.back_buffer[Screen::pixel_offset(x, y)] = draw_col;

diff --git a/src/px8/mod.rs b/src/px8/mod.rs
@@ -635,7 +635,6 @@ impl Px8New {
         }
 
         if self.configuration.lock().unwrap().show_mouse {
-
             let mouse_x = self.players.lock().unwrap().mouse_coordinate(0);
             let mouse_y = self.players.lock().unwrap().mouse_coordinate(1);