farbfeld

commit fdf5a2b53a7499e5860323255d914191aee7cdba
parent f0a4ce113d0e9dc50110a0ad9e98433d05aa2307
Author: FRIGN <dev@frign.de>
Date:   Mon, 21 Mar 2016 22:54:49 +0100

Write a better format for the row-buffer allocation

Diffstat:
M
ff2ppm.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ff2ppm.c b/ff2ppm.c
@@ -74,17 +74,17 @@ main(int argc, char *argv[])
 		fprintf(stderr, "%s: invalid height: zero\n", argv0);
 		return 1;
 	}
+
 	if (width > SIZE_MAX / ((sizeof("RGBA") - 1) * sizeof(uint16_t))) {
 		fprintf(stderr, "%s: row length integer overflow\n", argv0);
 		return 1;
 	}
-
 	rowlen = width * (sizeof("RGBA") - 1);
 	if (!(row = malloc(rowlen * sizeof(uint16_t)))) {
 		fprintf(stderr, "%s: malloc: %s\n", argv0, strerror(errno));
 		return 1;
 	}
-	if (!(rowout = malloc(width * sizeof("RGB") - 1))) {
+	if (!(rowout = malloc(width * (sizeof("RGB") - 1) * sizeof(uint16_t)))) {
 		fprintf(stderr, "%s: malloc: %s\n", argv0, strerror(errno));
 		return 1;
 	}