2 files changed, 15 insertions(+), 0 deletions(-)

M image-viewer/src/display_utils.c
M image-viewer/src/image.c

@@ 102,10 102,18 @@ void display_clear(display_t *display, bool render) {
 }
 
 display_pixel_t display_get_pixel(display_t *display, uint16_t x, uint16_t y) {
+  if (y >= DISPLAY_HEIGHT || x >= DISPLAY_WIDTH) {
+    return BLACK_PIXEL;
+  }
+
   return display->pixels[y * DISPLAY_WIDTH + x];
 }
 
 void display_set_pixel(display_t *display, uint16_t x, uint16_t y,
                        display_pixel_t pixel) {
+  if (y >= DISPLAY_HEIGHT || x >= DISPLAY_WIDTH) {
+    return;
+  }
+
   display->pixels[y * DISPLAY_WIDTH + x] = pixel;
 }

@@ 59,11 59,18 @@ bool image_region_move_within(image_region_t *to_move, direction_t direction,
 }
 
 display_pixel_t image_get_pixel(image_t *image, uint16_t x, uint16_t y) {
+  if (y >= image->height || x >= image->width) {
+    return BLACK_PIXEL;
+  }
   return image->pixels[y * image->width + x];
 }
 
 void image_set_pixel(image_t *image, uint16_t x, uint16_t y,
                        display_pixel_t pixel) {
+  if (y >= image->height || x >= image->width) {
+    return;
+  }
+
   image->pixels[y * image->width + x] = pixel;
 }