diff options
| author | erouault <erouault> | 2017-06-26 15:19:59 +0000 |
|---|---|---|
| committer | erouault <erouault> | 2017-06-26 15:19:59 +0000 |
| commit | da310a49942792adefd061f6f788ef293ffae415 (patch) | |
| tree | 78152861b108d6d53e879d81a4a4ad907c67d061 | |
| parent | c57118965195d8d28923430f046c1c8a585da83f (diff) | |
| download | libtiff-da310a49942792adefd061f6f788ef293ffae415.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libtiff/tif_jbig.c | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,12 @@ +2017-06-26 Even Rouault <even.rouault at spatialys.com> + + * 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 <even.rouault at spatialys.com> - * 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; } |