diff options
| author | erouault <erouault> | 2017-01-12 19:23:20 +0000 |
|---|---|---|
| committer | erouault <erouault> | 2017-01-12 19:23:20 +0000 |
| commit | c8b7f53f523445c70bc8810698367444934cf89b (patch) | |
| tree | 95e3e89d2ba3ee2b772ab6ba916cba0233043154 | |
| parent | 5cb7ef825122b31863b709802a554f650ce72817 (diff) | |
| download | libtiff-c8b7f53f523445c70bc8810698367444934cf89b.tar.gz | |
* libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesQTable,
OJPEGReadHeaderInfoSecTablesDcTable and OJPEGReadHeaderInfoSecTablesAcTable
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libtiff/tif_ojpeg.c | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,7 @@ 2017-01-12 Even Rouault <even.rouault at spatialys.com> - * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesAcTable + * libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesQTable, + OJPEGReadHeaderInfoSecTablesDcTable and OJPEGReadHeaderInfoSecTablesAcTable when read fails. Patch by Nicolás Peña. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c index ac70d1b1..bd4cff5d 100644 --- a/libtiff/tif_ojpeg.c +++ b/libtiff/tif_ojpeg.c @@ -1,4 +1,4 @@ -/* $Id: tif_ojpeg.c,v 1.67 2017-01-12 17:43:26 erouault Exp $ */ +/* $Id: tif_ojpeg.c,v 1.68 2017-01-12 19:23:20 erouault Exp $ */ /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0 specification is now totally obsolete and deprecated for new applications and @@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); if (p!=64) + { + _TIFFfree(ob); return(0); + } sp->qtable[m]=ob; sp->sof_tq[m]=m; } @@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) rb[sizeof(uint32)+5+n]=o[n]; p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); if (p!=q) + { + _TIFFfree(rb); return(0); + } sp->dctable[m]=rb; sp->sos_tda[m]=(m<<4); } |