Skip to content

opj_tcd: fix out-of-bounds read in opj_tcd_get_decoded_tile_size() when the reduce factor equals numresolutions (#1631) #1640

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
Alearner12 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

opj_tcd: fix out-of-bounds read in opj_tcd_get_decoded_tile_size() when the reduce factor equals numresolutions (#1631) #1640

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions src/lib/openjp2/j2k.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12553,12 +12553,11 @@ OPJ_BOOL opj_j2k_set_decoded_resolution_factor(opj_j2k_t *p_j2k,
{
OPJ_UINT32 it_comp;

p_j2k->m_cp.m_specific_param.m_dec.m_reduce = res_factor;

if (p_j2k->m_private_image) {
if (p_j2k->m_private_image->comps) {
if (p_j2k->m_specific_param.m_decoder.m_default_tcp) {
if (p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps) {
/* Validate against all components before mutating state. */
for (it_comp = 0 ; it_comp < p_j2k->m_private_image->numcomps; it_comp++) {
OPJ_UINT32 max_res =
p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps[it_comp].numresolutions;
Expand All @@ -12567,6 +12566,9 @@ OPJ_BOOL opj_j2k_set_decoded_resolution_factor(opj_j2k_t *p_j2k,
"Resolution factor is greater than the maximum resolution in the component.\n");
return OPJ_FALSE;
}
}
p_j2k->m_cp.m_specific_param.m_dec.m_reduce = res_factor;
for (it_comp = 0 ; it_comp < p_j2k->m_private_image->numcomps; it_comp++) {
p_j2k->m_private_image->comps[it_comp].factor = res_factor;
}
return OPJ_TRUE;
Expand All @@ -12575,6 +12577,8 @@ OPJ_BOOL opj_j2k_set_decoded_resolution_factor(opj_j2k_t *p_j2k,
}
}

/* Image not available yet; validated later at COD parsing time. */
p_j2k->m_cp.m_specific_param.m_dec.m_reduce = res_factor;
return OPJ_FALSE;
}

Expand Down
3 changes: 2 additions & 1 deletion src/lib/openjp2/tcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,8 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
/*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/

l_tilec->numresolutions = l_tccp->numresolutions;
if (l_tccp->numresolutions < l_cp->m_specific_param.m_dec.m_reduce) {
/* Use <= to prevent minimum_num_resolutions from underflowing to 0. */
if (l_tccp->numresolutions <= l_cp->m_specific_param.m_dec.m_reduce) {
l_tilec->minimum_num_resolutions = 1;
} else {
l_tilec->minimum_num_resolutions = l_tccp->numresolutions -
Expand Down