| From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001 |
| From: erouault <erouault> |
| Date: Thu, 12 Jan 2017 19:23:20 +0000 |
| Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in |
| OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and |
| OJPEGReadHeaderInfoSecTablesAcTable |
| |
| Fixes CVE-2017-7594 |
| |
| Signed-off-by: Peter Korsgaard <peter@korsgaard.com> |
| --- |
| libtiff/tif_ojpeg.c | 6 ++++++ |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c |
| index b92f0ebd..5f6c684c 100644 |
| --- a/libtiff/tif_ojpeg.c |
| +++ b/libtiff/tif_ojpeg.c |
| @@ -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); |
| } |
| -- |
| 2.11.0 |
| |
