3
0
Fork 0
forked from mirrors/nixpkgs

jasper: Patch for CVE-2014-8138 via RedHat.

This commit is contained in:
James Cook 2014-12-21 14:38:00 -08:00 committed by James Cook
parent 951ac10ae1
commit 1b5c9c24de
2 changed files with 17 additions and 0 deletions

View file

@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
patches = [
./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff
./jasper-CVE-2014-8138.diff
./jasper-CVE-2014-9029.diff
];

View file

@ -0,0 +1,16 @@
From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff
--- 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),