Attachment 635949 Details for Bug 871700 – proposed patch

[patch] proposed patch

ppm2tiff-CVE-2012-4564.patch (text/plain), 1.18 KB, created by Huzaifa S. Sidhpurwala on 2012-10-31 06:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2012-10-31 06:26:00 UTC

Size: 1.18 KB

patch

obsolete

>Index: tools/ppm2tiff.c
>===================================================================
>RCS file: /cvs/maptools/cvsroot/libtiff/tools/ppm2tiff.c,v
>retrieving revision 1.16
>diff -u -r1.16 ppm2tiff.c
>--- tools/ppm2tiff.c	10 Apr 2010 19:22:34 -0000	1.16
>+++ tools/ppm2tiff.c	31 Oct 2012 06:25:13 -0000
>@@ -1,4 +1,4 @@
>-/* $Id$ */
>+/* $Id: ppm2tiff.c,v 1.16 2010-04-10 19:22:34 bfriesen Exp $ */
> 
> /*
>  * Copyright (c) 1991-1997 Sam Leffler
>@@ -89,6 +89,7 @@
> 	int c;
> 	extern int optind;
> 	extern char* optarg;
>+	tmsize_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);

Actions: View | Diff

Attachments on bug 871700: 635949