Prevent overflow in rowlen and improve inaccuracies in style

1 files changed, 2 insertions, 3 deletions

diff --git a/jpg2ff.c b/jpg2ff.c
index dc5b060..8ebc81d 100644
--- a/jpg2ff.c
+++ b/jpg2ff.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <jpeglib.h>
 
@@ -58,7 +57,7 @@ main(int argc, char *argv[])
 	jpgrow = (*js.mem->alloc_sarray)((j_common_ptr)&js,
 	                                 JPOOL_IMAGE, width *
 	                                 js.output_components, 1);
-	rowlen = strlen("RGBA") * width;
+	rowlen = width * (sizeof("RGBA") - 1);
 	if(!(row = malloc(rowlen * sizeof(uint16_t)))) {
 		fprintf(stderr, "%s: malloc: out of memory\n", argv0);
 		return 1;
@@ -89,7 +88,7 @@ main(int argc, char *argv[])
 		}
 
 		/* write data */
-		if (fwrite(row, 2, rowlen, stdout) != rowlen)
+		if (fwrite(row, sizeof(uint16_t), rowlen, stdout) != rowlen)
 			goto writerr;
 	}
 	jpeg_finish_decompress(&js);