56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 368f11b41c726df5d888124330855e1042db9603 Mon Sep 17 00:00:00 2001
|
|
From: erouault <erouault>
|
|
Date: Thu, 12 Jan 2017 19:23:20 +0000
|
|
Subject: [PATCH 3/8] * libtiff/tif_ojpeg.c: fix leak in
|
|
OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and
|
|
OJPEGReadHeaderInfoSecTablesAcTable
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
* libtiff/tif_ojpeg.c: fix leak in OJPEGReadHeaderInfoSecTablesAcTable when read fails. Patch by Nicolás Peña. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659
|
|
---
|
|
libtiff/tif_ojpeg.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
|
|
index 0e69a46..3421a05 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);
|
|
}
|
|
@@ -1918,7 +1924,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(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->actable[m]=rb;
|
|
sp->sos_tda[m]=(sp->sos_tda[m]|m);
|
|
}
|
|
--
|
|
2.7.4
|
|
|