diff options
| author | erouault <erouault> | 2016-12-20 17:24:35 +0000 |
|---|---|---|
| committer | erouault <erouault> | 2016-12-20 17:24:35 +0000 |
| commit | 378e69b78fb12fd6bdfc329bb8fbebea307ef723 (patch) | |
| tree | 28c157a01f2df2d6ee816d3882f1d2779ded5ec6 | |
| parent | 5cf63fa6b801665fe8666c1cfac0288970071086 (diff) | |
| download | libtiff-378e69b78fb12fd6bdfc329bb8fbebea307ef723.tar.gz | |
* tools/tiff2pdf.c: avoid potential invalid memory read in
t2p_writeproc.
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2639
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tools/tiff2pdf.c | 20 |
2 files changed, 17 insertions, 9 deletions
@@ -1,5 +1,11 @@ 2016-12-20 Even Rouault <even.rouault at spatialys.com> + * tools/tiff2pdf.c: avoid potential invalid memory read in + t2p_writeproc. + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2639 + +2016-12-20 Even Rouault <even.rouault at spatialys.com> + * tools/tiff2pdf.c: fix wrong usage of memcpy() that can trigger unspecified behaviour. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2638 diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c index 78ffa77d..5348f1a7 100644 --- a/tools/tiff2pdf.c +++ b/tools/tiff2pdf.c @@ -1,4 +1,4 @@ -/* $Id: tiff2pdf.c,v 1.99 2016-12-20 17:13:26 erouault Exp $ +/* $Id: tiff2pdf.c,v 1.100 2016-12-20 17:24:35 erouault Exp $ * * tiff2pdf - converts a TIFF image to a PDF document * @@ -2896,6 +2896,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_ } if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) { if (count >= 4) { + int retTIFFReadRawTile; /* Ignore EOI marker of JpegTables */ _TIFFmemcpy(buffer, jpt, count - 2); bufferoffset += count - 2; @@ -2903,22 +2904,23 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_ table_end[0] = buffer[bufferoffset-2]; table_end[1] = buffer[bufferoffset-1]; xuint32 = bufferoffset; - bufferoffset -= 2; - bufferoffset += TIFFReadRawTile( + bufferoffset -= 2; + retTIFFReadRawTile= TIFFReadRawTile( input, tile, (tdata_t) &(((unsigned char*)buffer)[bufferoffset]), -1); + if( retTIFFReadRawTile < 0 ) + { + _TIFFfree(buffer); + t2p->t2p_error = T2P_ERR_ERROR; + return(0); + } + bufferoffset += retTIFFReadRawTile; /* Overwrite SOI marker of image scan with previously */ /* saved end of JpegTables */ buffer[xuint32-2]=table_end[0]; buffer[xuint32-1]=table_end[1]; - } else { - bufferoffset += TIFFReadRawTile( - input, - tile, - (tdata_t) &(((unsigned char*)buffer)[bufferoffset]), - -1); } } t2pWriteFile(output, (tdata_t) buffer, bufferoffset); |