22 lines
891 B
Diff
22 lines
891 B
Diff
|
Fix CVE-2014-8138 (heap overflow in jp2_decode()).
|
||
|
|
|
||
|
|
Copied from Fedora.
|
||
|
|
|
||
|
|
http://pkgs.fedoraproject.org/cgit/rpms/jasper.git/tree/jasper-CVE-2014-8138.patch
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1173162
|
||
|
|
|
||
|
|
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100
|
||
|
|
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100
|
||
|
|
@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in
|
||
|
|
/* Determine the type of each component. */
|
||
|
|
if (dec->cdef) {
|
||
|
|
for (i = 0; i < dec->numchans; ++i) {
|
||
|
|
+ /* Is the channel number reasonable? */
|
||
|
|
+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
|
||
|
|
+ jas_eprintf("error: invalid channel number in CDEF box\n");
|
||
|
|
+ goto error;
|
||
|
|
+ }
|
||
|
|
jas_image_setcmpttype(dec->image,
|
||
|
|
dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
|
||
|
|
jp2_getct(jas_image_clrspc(dec->image),
|