8ca2e9
Upstream patch for CVE-2012-3401.
8ca2e9
8ca2e9
8ca2e9
diff -Naur tiff-3.9.4.orig/tools/tiff2pdf.c tiff-3.9.4/tools/tiff2pdf.c
8ca2e9
--- tiff-3.9.4.orig/tools/tiff2pdf.c	2010-06-13 16:51:44.000000000 -0400
8ca2e9
+++ tiff-3.9.4/tools/tiff2pdf.c	2012-12-11 11:17:56.506344841 -0500
8ca2e9
@@ -1090,6 +1090,7 @@
8ca2e9
 				"Can't set directory %u of input file %s", 
8ca2e9
 				i,
8ca2e9
 				TIFFFileName(input));
8ca2e9
+			t2p->t2p_error = T2P_ERR_ERROR;
8ca2e9
 			return;
8ca2e9
 		}
8ca2e9
 		if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){
8ca2e9
@@ -3153,6 +3154,7 @@
8ca2e9
 			"Can't allocate %u bytes of memory for t2p_process_ojpeg_tables, %s", 
8ca2e9
 			2048, 
8ca2e9
 			TIFFFileName(input));
8ca2e9
+		t2p->t2p_error = T2P_ERR_ERROR;
8ca2e9
 		return(0);
8ca2e9
 	}
8ca2e9
 	_TIFFmemset(t2p->pdf_ojpegdata, 0x00, 2048);
8ca2e9
@@ -5248,6 +5250,7 @@
8ca2e9
 			TIFF2PDF_MODULE, 
8ca2e9
 			"Can't allocate %u bytes of memory for t2p_write_pdf", 
8ca2e9
 			t2p->pdf_xrefcount * sizeof(uint32) );
8ca2e9
+		t2p->t2p_error = T2P_ERR_ERROR;
8ca2e9
 		return(written);
8ca2e9
 	}
8ca2e9
 	t2p->pdf_xrefcount=0;