Skip to content

jpc_t2cod: reject zero shifted sampling factors in packet iterators #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliasabk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

jpc_t2cod: reject zero shifted sampling factors in packet iterators #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions src/libjasper/jpc/jpc_t2cod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,14 @@ static int jpc_pi_nextrpcl(register jpc_pi_t *pi)
r = pi->picomp->numrlvls - 1 - pi->rlvlno;
rpx = r + pi->pirlvl->prcwidthexpn;
rpy = r + pi->pirlvl->prcheightexpn;
/* The sampling factors shifted left can wrap around to
zero, which would cause a division by zero below. */
if (!(pi->picomp->hsamp << r) ||
!(pi->picomp->vsamp << r) ||
!(pi->picomp->hsamp << rpx) ||
!(pi->picomp->vsamp << rpy)) {
return -1;
}
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
if (((pi->x == pi->xstart &&
Expand Down Expand Up @@ -438,10 +446,18 @@ static int jpc_pi_nextpcrl(register jpc_pi_t *pi)
continue;
}
r = pi->picomp->numrlvls - 1 - pi->rlvlno;
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
rpx = r + pi->pirlvl->prcwidthexpn;
rpy = r + pi->pirlvl->prcheightexpn;
/* The sampling factors shifted left can wrap around to
zero, which would cause a division by zero below. */
if (!(pi->picomp->hsamp << r) ||
!(pi->picomp->vsamp << r) ||
!(pi->picomp->hsamp << rpx) ||
!(pi->picomp->vsamp << rpy)) {
return -1;
}
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
if (((pi->x == pi->xstart &&
((trx0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpx))) ||
!(pi->x % (pi->picomp->hsamp << rpx))) &&
Expand Down Expand Up @@ -568,10 +584,18 @@ static int jpc_pi_nextcprl(register jpc_pi_t *pi)
continue;
}
r = pi->picomp->numrlvls - 1 - pi->rlvlno;
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
rpx = r + pi->pirlvl->prcwidthexpn;
rpy = r + pi->pirlvl->prcheightexpn;
/* The sampling factors shifted left can wrap around to
zero, which would cause a division by zero below. */
if (!(pi->picomp->hsamp << r) ||
!(pi->picomp->vsamp << r) ||
!(pi->picomp->hsamp << rpx) ||
!(pi->picomp->vsamp << rpy)) {
return -1;
}
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
if (((pi->x == pi->xstart &&
((trx0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpx))) ||
!(pi->x % (pi->picomp->hsamp << rpx))) &&
Expand Down