* 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
This commit is contained in:
parent
a85d5f09dd
commit
ede7b68218
@ -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>
|
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,
|
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
|
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
|
scans and not interleavedin a single one, needs to allocate memory (or
|
||||||
|
@ -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
|
* 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)
|
jbg_strerror(decodeStatus)
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
|
jbg_dec_free(&decoder);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user