walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1217 from rouault/fix_ossfuzz_18979 

pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets()
This commit is contained in:
Even Rouault 2019-11-17 13:08:41 +01:00 committed by GitHub
parent 9701b3305d 4cb1f66304
commit ac3737372a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/openjp2/pi.c
View File

@ -376,10 +376,10 @@ static OPJ_BOOL opj_pi_next_rpcl(opj_pi_iterator_t * pi)
pi->poc.tx1 = pi->tx1; pi->poc.tx1 = pi->tx1;
} }
for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) { for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; for (pi->y = (OPJ_UINT32)pi->poc.ty0; pi->y < (OPJ_UINT32)pi->poc.ty1;
pi->y += (OPJ_INT32)(pi->dy - (OPJ_UINT32)(pi->y % (OPJ_INT32)pi->dy))) { pi->y += (pi->dy - (pi->y % pi->dy))) {
for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; for (pi->x = (OPJ_UINT32)pi->poc.tx0; pi->x < (OPJ_UINT32)pi->poc.tx1;
pi->x += (OPJ_INT32)(pi->dx - (OPJ_UINT32)(pi->x % (OPJ_INT32)pi->dx))) { pi->x += (pi->dx - (pi->x % pi->dx))) {
for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) { for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
OPJ_UINT32 levelno; OPJ_UINT32 levelno;
OPJ_INT32 trx0, try0; OPJ_INT32 trx0, try0;
@ -508,10 +508,10 @@ static OPJ_BOOL opj_pi_next_pcrl(opj_pi_iterator_t * pi)
pi->poc.ty1 = pi->ty1; pi->poc.ty1 = pi->ty1;
pi->poc.tx1 = pi->tx1; pi->poc.tx1 = pi->tx1;
} }
for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; for (pi->y = (OPJ_UINT32)pi->poc.ty0; pi->y < (OPJ_UINT32)pi->poc.ty1;
pi->y += (OPJ_INT32)(pi->dy - (OPJ_UINT32)(pi->y % (OPJ_INT32)pi->dy))) { pi->y += (pi->dy - (pi->y % pi->dy))) {
for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; for (pi->x = (OPJ_UINT32)pi->poc.tx0; pi->x < (OPJ_UINT32)pi->poc.tx1;
pi->x += (OPJ_INT32)(pi->dx - (OPJ_UINT32)(pi->x % (OPJ_INT32)pi->dx))) { pi->x += (pi->dx - (pi->x % pi->dx))) {
for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) { for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
comp = &pi->comps[pi->compno]; comp = &pi->comps[pi->compno];
for (pi->resno = pi->poc.resno0; for (pi->resno = pi->poc.resno0;
@ -639,10 +639,10 @@ static OPJ_BOOL opj_pi_next_cprl(opj_pi_iterator_t * pi)
pi->poc.ty1 = pi->ty1; pi->poc.ty1 = pi->ty1;
pi->poc.tx1 = pi->tx1; pi->poc.tx1 = pi->tx1;
} }
for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; for (pi->y = (OPJ_UINT32)pi->poc.ty0; pi->y < (OPJ_UINT32)pi->poc.ty1;
pi->y += (OPJ_INT32)(pi->dy - (OPJ_UINT32)(pi->y % (OPJ_INT32)pi->dy))) { pi->y += (pi->dy - (pi->y % pi->dy))) {
for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; for (pi->x = (OPJ_UINT32)pi->poc.tx0; pi->x < (OPJ_UINT32)pi->poc.tx1;
pi->x += (OPJ_INT32)(pi->dx - (OPJ_UINT32)(pi->x % (OPJ_INT32)pi->dx))) { pi->x += (pi->dx - (pi->x % pi->dx))) {
for (pi->resno = pi->poc.resno0; for (pi->resno = pi->poc.resno0;
pi->resno < opj_uint_min(pi->poc.resno1, comp->numresolutions); pi->resno++) { pi->resno < opj_uint_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
OPJ_UINT32 levelno; OPJ_UINT32 levelno;

4
src/lib/openjp2/pi.h
View File

@ -102,9 +102,9 @@ typedef struct opj_pi_iterator {
/** Components*/ /** Components*/
opj_pi_comp_t *comps; opj_pi_comp_t *comps;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_INT32 tx0, ty0, tx1, ty1; OPJ_UINT32 tx0, ty0, tx1, ty1;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_INT32 x, y; OPJ_UINT32 x, y;
/** FIXME DOC*/ /** FIXME DOC*/
OPJ_UINT32 dx, dy; OPJ_UINT32 dx, dy;
} opj_pi_iterator_t; } opj_pi_iterator_t;