From ede7b68218ebc835ca68026f532951f1f6568688 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 --- ChangeLog | 8 +++++++- libtiff/tif_jbig.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc5096e7..ecd70534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ +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-24 Even Rouault - * libjpeg/tif_jpeg.c: error out at decoding time if anticipated libjpeg + * libtiff/tif_jpeg.c: error out at decoding time if anticipated libjpeg memory allocation is above 100 MB. libjpeg in case of multiple scans, which is allowed even in baseline JPEG, if components are spread over several scans and not interleavedin a single one, needs to allocate memory (or diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c index 37878f6e..7a14dd9a 100644 --- a/libtiff/tif_jbig.c +++ b/libtiff/tif_jbig.c @@ -1,4 +1,4 @@ -/* $Id: tif_jbig.c,v 1.15 2010-03-10 18:56:48 bfriesen Exp $ */ +/* $Id: tif_jbig.c,v 1.16 2017-06-26 15:20:00 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -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; }