You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.6 KiB
46 lines
1.6 KiB
From 8283e4d1b7e53340684d12932880cbcbaf23a8c1 Mon Sep 17 00:00:00 2001
|
|
From: erouault <erouault>
|
|
Date: Thu, 12 Jan 2017 17:43:25 +0000
|
|
Subject: [PATCH] =?UTF-8?q?*=20libtiff/tif=5Fojpeg.c:=20fix=20leak=20in=20?=
|
|
=?UTF-8?q?OJPEGReadHeaderInfoSecTablesAcTable=20when=20read=20fails.=20Pa?=
|
|
=?UTF-8?q?tch=20by=20Nicol=C3=A1s=20Pe=C3=B1a.=20Fixes=20http://bugzilla.?=
|
|
=?UTF-8?q?maptools.org/show=5Fbug.cgi=3Fid=3D2659?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
ChangeLog | 7 +++++++
|
|
libtiff/tif_ojpeg.c | 3 +++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 6e6f3b0..12e0370 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,10 @@
|
|
+2017-01-12 Even Rouault <even.rouault at spatialys.com>
|
|
+
|
|
+ * 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
|
|
+
|
|
2017-01-11 Even Rouault <even.rouault at spatialys.com>
|
|
|
|
* libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add _TIFFcalloc()
|
|
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
|
|
index f19e8fd..b92f0eb 100644
|
|
--- a/libtiff/tif_ojpeg.c
|
|
+++ b/libtiff/tif_ojpeg.c
|
|
@@ -1918,7 +1918,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);
|
|
}
|