24 lines
999 B
Diff
24 lines
999 B
Diff
|
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
|
||
|
|
--- jasper-1.900.1/src/libjasper/jpc/jpc_cs.c.CERT-VU-887409 2011-10-25 17:25:39.000000000 +0200
|
||
|
|
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2011-10-25 17:29:14.379371908 +0200
|
||
|
|
@@ -744,6 +744,10 @@ static int jpc_cox_getcompparms(jpc_ms_t
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
compparms->numrlvls = compparms->numdlvls + 1;
|
||
|
|
+ if (compparms->numrlvls > JPC_MAXRLVLS) {
|
||
|
|
+ jpc_cox_destroycompparms(compparms);
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
if (prtflag) {
|
||
|
|
for (i = 0; i < compparms->numrlvls; ++i) {
|
||
|
|
if (jpc_getuint8(in, &tmp)) {
|
||
|
|
@@ -1331,7 +1335,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;
|