9ad3263e80
- Security fixes Multiple integer overflows Buffer overflow in the jas_stream_printf execute arbitrary code on decodes images Security: CVE-2008-3520 Security: CVE-2008-3522 Security: CVE-2011-4516 Security: CVE-2011-4517 PR: 163718 Obtained from: Fedora Feature safe: yes
60 lines
2 KiB
C
60 lines
2 KiB
C
--- src/libjasper/jp2/jp2_cod.c.orig 2013-04-17 22:32:23.000000000 +0200
|
|
+++ src/libjasper/jp2/jp2_cod.c 2013-04-17 22:32:23.000000000 +0200
|
|
@@ -255,7 +255,7 @@
|
|
box = 0;
|
|
tmpstream = 0;
|
|
|
|
- if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
|
|
+ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
|
|
goto error;
|
|
}
|
|
box->ops = &jp2_boxinfo_unk.ops;
|
|
@@ -380,7 +380,7 @@
|
|
jp2_bpcc_t *bpcc = &box->data.bpcc;
|
|
unsigned int i;
|
|
bpcc->numcmpts = box->datalen;
|
|
- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
|
|
+ if (!(bpcc->bpcs = jas_malloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
|
|
return -1;
|
|
}
|
|
for (i = 0; i < bpcc->numcmpts; ++i) {
|
|
@@ -424,7 +424,7 @@
|
|
break;
|
|
case JP2_COLR_ICC:
|
|
colr->iccplen = box->datalen - 3;
|
|
- if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
|
|
+ if (!(colr->iccp = jas_malloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
|
|
return -1;
|
|
}
|
|
if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
|
|
@@ -461,7 +461,7 @@
|
|
if (jp2_getuint16(in, &cdef->numchans)) {
|
|
return -1;
|
|
}
|
|
- if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
|
|
+ if (!(cdef->ents = jas_malloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
|
|
return -1;
|
|
}
|
|
for (channo = 0; channo < cdef->numchans; ++channo) {
|
|
@@ -774,7 +774,7 @@
|
|
unsigned int i;
|
|
|
|
cmap->numchans = (box->datalen) / 4;
|
|
- if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
|
|
+ if (!(cmap->ents = jas_malloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
|
|
return -1;
|
|
}
|
|
for (i = 0; i < cmap->numchans; ++i) {
|
|
@@ -836,10 +836,10 @@
|
|
return -1;
|
|
}
|
|
lutsize = pclr->numlutents * pclr->numchans;
|
|
- if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
|
|
+ if (!(pclr->lutdata = jas_malloc2(lutsize, sizeof(int_fast32_t)))) {
|
|
return -1;
|
|
}
|
|
- if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
|
|
+ if (!(pclr->bpc = jas_malloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
|
|
return -1;
|
|
}
|
|
for (i = 0; i < pclr->numchans; ++i) {
|