Fix out-of-bounds image slices

Author: Rangi42

include/gfx/main.hpp

@@ -40,6 +40,8 @@ struct Options {
 		uint16_t top;
 		uint16_t width;
 		uint16_t height;
+		uint32_t right() const { return left + width * 8; }
+		uint32_t bottom() const { return top + height * 8; }
 	} inputSlice{0, 0, 0, 0};                          // -L (margins in clockwise order, like CSS)
 	std::array<uint16_t, 2> maxNbTiles{UINT16_MAX, 0}; // -N
 	uint16_t nbPalettes = 8;                           // -n

src/gfx/main.cpp

@@ -863,7 +863,7 @@ int main(int argc, char *argv[]) {
 		}
 		fprintf(
 		    stderr,
-		    "\tInput image slice: %" PRIu32 "x%" PRIu32 " pixels starting at (%" PRId32 ", %" PRId32
+		    "\tInput image slice: %" PRIu16 "x%" PRIu16 " pixels starting at (%" PRIu16 ", %" PRIu16
 		    ")\n",
 		    options.inputSlice.width,
 		    options.inputSlice.height,

src/gfx/process.cpp

@@ -226,6 +226,30 @@ class Png {
 		if (options.inputSlice.height == 0 && height % 8 != 0) {
 			fatal("Image height (%" PRIu32 " pixels) is not a multiple of 8!", height);
 		}
+		if (options.inputSlice.right() > width || options.inputSlice.bottom() > height) {
+			error(
+			    "Image slice ((%" PRIu16 ", %" PRIu16 ") to (%" PRIu32 ", %" PRIu32
+			    ")) is outside the image bounds (%" PRIu32 "x%" PRIu32 ")!",
+			    options.inputSlice.left,
+			    options.inputSlice.top,
+			    options.inputSlice.right(),
+			    options.inputSlice.bottom(),
+			    width,
+			    height
+			);
+			if (options.inputSlice.width % 8 == 0 && options.inputSlice.height % 8 == 0) {
+				fprintf(
+				    stderr,
+				    "note: Did you mean the slice \"%" PRIu32 ",%" PRIu32 ":%" PRId32 ",%" PRId32
+				    "\"? (width and height are in tiles, not pixels!)\n",
+				    options.inputSlice.left,
+				    options.inputSlice.top,
+				    options.inputSlice.width / 8,
+				    options.inputSlice.height / 8
+				);
+			}
+			giveUp();
+		}
 
 		pixels.resize(static_cast<size_t>(width) * static_cast<size_t>(height));
 

test/gfx/bad_slice.err

@@ -0,0 +1,3 @@
+error: Image slice ((2, 2) to (130, 130)) is outside the image bounds (20x20)!
+note: Did you mean the slice "2,2:2,2"? (width and height are in tiles, not pixels!)
+Conversion aborted after 1 error

test/gfx/bad_slice.flags

@@ -0,0 +1 @@
+-L 2,2:16,16

test/gfx/bad_slice.png

@@ -0,0 +1,2 @@
+error: Image slice ((2, 2) to (34, 18)) is outside the image bounds (20x20)!
+Conversion aborted after 1 error

test/gfx/oob_slice_wh.err

@@ -0,0 +1 @@
+-L 2,2:4,2

test/gfx/oob_slice_wh.flags

@@ -0,0 +1,2 @@
+error: Image slice ((2, 99) to (10, 107)) is outside the image bounds (20x20)!
+Conversion aborted after 1 error