cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In tiff2pdf.c, fail when TIFFSetDirectory() fails.

Browse Source
This commit is contained in:
Tom Lane 2012-07-18 15:07:55 +00:00
parent 06dac7192d
commit 7e000dd360
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-07-18 Tom Lane <tgl@sss.pgh.pa.us>
* tools/tiff2pdf.c: Fail when TIFFSetDirectory() fails. This
prevents core dumps or perhaps even arbitrary code execution when
processing a corrupt input file (CVE-2012-3401).
2012-07-06 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* test/raw_decode.c (main): Test fixes to work with IJG JPEG 7+.

3
tools/tiff2pdf.c
View File

@ -1,4 +1,4 @@
/* $Id: tiff2pdf.c,v 1.67 2012-06-15 21:51:54 fwarmerdam Exp $
/* $Id: tiff2pdf.c,v 1.68 2012-07-18 15:07:55 tgl Exp $
*
* tiff2pdf - converts a TIFF image to a PDF document
*
@ -1066,6 +1066,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
"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)){