aboutsummaryrefslogtreecommitdiffstats
path: root/main/jasper/jasper-1.900.1-bnc725758.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-12-22 13:09:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-12-22 13:19:24 +0000
commitc2e8048e9057cba684d3df7ba2ebc3354d1d34d2 (patch)
tree764d99cb300e632b3fa32f154d537dfe6bcfa040 /main/jasper/jasper-1.900.1-bnc725758.patch
parent7a5f1f2c0277796d7679e975db6f3bc3fd2c4bdd (diff)
downloadaports-c2e8048e9057cba684d3df7ba2ebc3354d1d34d2.tar.bz2
aports-c2e8048e9057cba684d3df7ba2ebc3354d1d34d2.tar.xz
main/jasper: security fixes (CVE-2011-4516, CVE-2011-4517)
fixes #879
Diffstat (limited to 'main/jasper/jasper-1.900.1-bnc725758.patch')
-rw-r--r--main/jasper/jasper-1.900.1-bnc725758.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/main/jasper/jasper-1.900.1-bnc725758.patch b/main/jasper/jasper-1.900.1-bnc725758.patch
new file mode 100644
index 0000000000..d2366dfad4
--- /dev/null
+++ b/main/jasper/jasper-1.900.1-bnc725758.patch
@@ -0,0 +1,25 @@
+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;