Blame SOURCES/jasper-1.900.1-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch

978a2f
diff -up jasper-1.900.1/src/libjasper/jpc/jpc_cs.c.CERT-VU-887409 jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
978a2f
--- jasper-1.900.1/src/libjasper/jpc/jpc_cs.c.CERT-VU-887409	2011-10-25 17:25:39.000000000 +0200
978a2f
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2011-10-25 17:29:14.379371908 +0200
978a2f
@@ -744,6 +744,10 @@ static int jpc_cox_getcompparms(jpc_ms_t
978a2f
 		return -1;
978a2f
 	}
978a2f
 	compparms->numrlvls = compparms->numdlvls + 1;
978a2f
+	if (compparms->numrlvls > JPC_MAXRLVLS) {
978a2f
+		jpc_cox_destroycompparms(compparms);
978a2f
+		return -1;
978a2f
+	}
978a2f
 	if (prtflag) {
978a2f
 		for (i = 0; i < compparms->numrlvls; ++i) {
978a2f
 			if (jpc_getuint8(in, &tmp)) {
978a2f
@@ -1331,7 +1335,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
978a2f
 	jpc_crgcomp_t *comp;
978a2f
 	uint_fast16_t compno;
978a2f
 	crg->numcomps = cstate->numcomps;
978a2f
-	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
978a2f
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
978a2f
 		return -1;
978a2f
 	}
978a2f
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;