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