aboutsummaryrefslogblamecommitdiffstats
path: root/main/jasper/jasper-1.900.1-bnc725758.patch
blob: d2366dfad4b5480939cdd8844f1712c98041ab07 (plain) (tree)
























                                                                                   
diff -up src/libjasper/jpc/jpc_cs.c.orig-725758 src/libjasper/jpc/jpc_cs.c
--- ./src/libjasper/jpc/jpc_cs.c.orig-725758	2011-12-12 18:36:53.772117206 +0100
+++ ./src/libjasper/jpc/jpc_cs.c	2011-12-12 18:36:12.805999375 +0100
@@ -744,6 +744,12 @@ static int jpc_cox_getcompparms(jpc_ms_t
 		return -1;
 	}
 	compparms->numrlvls = compparms->numdlvls + 1;
+	if (compparms->numrlvls > JPC_MAXRLVLS) {
+		compparms->numrlvls = 0;
+		jpc_cox_destroycompparms(compparms);
+		return -1;
+	}
+
 	if (prtflag) {
 		for (i = 0; i < compparms->numrlvls; ++i) {
 			if (jpc_getuint8(in, &tmp)) {
@@ -1331,7 +1337,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;