ensure return after memory allocation failure (#2449, CVS-2013-4232)

This commit is contained in:
Frank Warmerdam 2013-08-14 05:11:36 +00:00
parent 4e7465a311
commit 67d92d90f8
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2013-08-13 Frank Warmerdam <warmerdam@pobox.com>
* tools/tiff2pdf.c: terminate after failure of allocating
ycbcr buffer (bug #2449, CVE-2013-4232)
2013-07-09 Frank Warmerdam <warmerdam@google.com>
* tools/tiffinfo.c: Default various values fetched with

View File

@ -1,4 +1,4 @@
/* $Id: tiff2pdf.c,v 1.71 2013-05-02 14:54:08 tgl Exp $
/* $Id: tiff2pdf.c,v 1.72 2013-08-14 05:11:37 fwarmerdam Exp $
*
* tiff2pdf - converts a TIFF image to a PDF document
*
@ -2461,7 +2461,8 @@ tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){
(unsigned long) t2p->tiff_datasize,
TIFFFileName(input));
t2p->t2p_error = T2P_ERR_ERROR;
_TIFFfree(buffer);
_TIFFfree(buffer);
return(0);
} else {
buffer=samplebuffer;
t2p->tiff_datasize *= t2p->tiff_samplesperpixel;