File tiff-3.9.5-CVE-2012-4564.patch of Package tiff

Overview Repositories Revisions Requests Users Attributes Meta

File tiff-3.9.5-CVE-2012-4564.patch of Package tiff (Revision 07a60e3cca0a694206259df4b34e3a6c)

Currently displaying revision 07a60e3cca0a694206259df4b34e3a6c , Show latest

Index: tools/ppm2tiff.c
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/tools/ppm2tiff.c,v
--- tools/ppm2tiff.c	10 Apr 2010 19:22:34 -0000	1.16
+++ tools/ppm2tiff.c	31 Oct 2012 06:25:13 -0000
@@ -89,6 +89,7 @@ 
 	int c;
 	extern int optind;
 	extern char* optarg;
+	tsize_t scanline_size;
 
 	if (argc < 2) {
 	    fprintf(stderr, "%s: Too few arguments\n", argv[0]);
@@ -237,8 +238,16 @@ 
 	}
 	if (TIFFScanlineSize(out) > linebytes)
 		buf = (unsigned char *)_TIFFmalloc(linebytes);
-	else
-		buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
+	else {
+		scanline_size = TIFFScanlineSize(out);
+		if (scanline_size != 0)
+			buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
+		else {
+			fprintf(stderr, "%s: scanline size overflow\n",infile);
+			(void) TIFFClose(out);
+			exit(-2);					
+			}
+		}
 	if (resolution > 0) {
 		TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
 		TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);

Places

File tiff-3.9.5-CVE-2012-4564.patch of Package tiff (Revision 07a60e3cca0a694206259df4b34e3a6c)

Places