Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 1 | From 62efea76592647426deec5592fd7274d5c950646 Mon Sep 17 00:00:00 2001 |
| 2 | From: Even Rouault <even.rouault@spatialys.com> |
| 3 | Date: Mon, 26 Jun 2017 15:19:59 +0000 |
| 4 | Subject: [PATCH] * libtiff/tif_jbig.c: fix memory leak in error code path of |
| 5 | JBIGDecode() Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2706 Reported |
| 6 | by team OWL337 |
| 7 | |
| 8 | * libtiff/tif_jpeg.c: error out at decoding time if anticipated libjpeg |
| 9 | |
| 10 | Upstream-Status: Backport |
| 11 | [https://github.com/vadz/libtiff/commit/fe8d7165956b88df4837034a9161dc5fd20cf67a] |
| 12 | |
| 13 | CVE: CVE-2017-9936 |
| 14 | |
| 15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 16 | --- |
| 17 | ChangeLog | 6 ++++++ |
| 18 | libtiff/tif_jbig.c | 1 + |
| 19 | 2 files changed, 7 insertions(+) |
| 20 | |
| 21 | Index: tiff-4.0.7/ChangeLog |
| 22 | =================================================================== |
| 23 | --- tiff-4.0.7.orig/ChangeLog |
| 24 | +++ tiff-4.0.7/ChangeLog |
| 25 | @@ -1,3 +1,9 @@ |
| 26 | +2017-06-26 Even Rouault <even.rouault at spatialys.com> |
| 27 | + |
| 28 | + * libtiff/tif_jbig.c: fix memory leak in error code path of JBIGDecode() |
| 29 | + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2706 |
| 30 | + Reported by team OWL337 |
| 31 | + |
| 32 | 2017-06-01 Even Rouault <even.rouault at spatialys.com> |
| 33 | |
| 34 | * libtiff/tif_dirinfo.c, tif_dirread.c: add _TIFFCheckFieldIsValidForCodec(), |
| 35 | Index: tiff-4.0.7/libtiff/tif_jbig.c |
| 36 | =================================================================== |
| 37 | --- tiff-4.0.7.orig/libtiff/tif_jbig.c |
| 38 | +++ tiff-4.0.7/libtiff/tif_jbig.c |
| 39 | @@ -94,6 +94,7 @@ static int JBIGDecode(TIFF* tif, uint8* |
| 40 | jbg_strerror(decodeStatus) |
| 41 | #endif |
| 42 | ); |
| 43 | + jbg_dec_free(&decoder); |
| 44 | return 0; |
| 45 | } |
| 46 | |