From 62efea76592647426deec5592fd7274d5c950646 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 26 Jun 2017 15:19:59 +0000 Subject: [PATCH] * libtiff/tif_jbig.c: fix memory leak in error code path of JBIGDecode() Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2706 Reported by team OWL337 * libtiff/tif_jpeg.c: error out at decoding time if anticipated libjpeg Upstream-Status: Backport [https://github.com/vadz/libtiff/commit/fe8d7165956b88df4837034a9161dc5fd20cf67a] CVE: CVE-2017-9936 Signed-off-by: Yi Zhao --- ChangeLog | 6 ++++++ libtiff/tif_jbig.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5739292..0240f0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-06-26 Even Rouault + + * libtiff/tif_jbig.c: fix memory leak in error code path of JBIGDecode() + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2706 + Reported by team OWL337 + 2017-06-01 Even Rouault * libtiff/tif_dirinfo.c, tif_dirread.c: add _TIFFCheckFieldIsValidForCodec(), diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c index 5f5f75e..c75f31d 100644 --- a/libtiff/tif_jbig.c +++ b/libtiff/tif_jbig.c @@ -94,6 +94,7 @@ static int JBIGDecode(TIFF* tif, uint8* buffer, tmsize_t size, uint16 s) jbg_strerror(decodeStatus) #endif ); + jbg_dec_free(&decoder); return 0; } -- 2.7.4