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

Merge pull request #1229 from rouault/fix_1228 

opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228)
This commit is contained in:
Even Rouault 2020-01-11 11:29:11 +01:00 committed by GitHub
parent ac3737372a 024b840739
commit 46c1eff9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/openjp2/j2k.c
View File

@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
l_img_comp = p_image->comps; l_img_comp = p_image->comps;
for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
OPJ_INT32 l_h, l_w; OPJ_INT32 l_h, l_w;
if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
p_image->y0 > (OPJ_UINT32)INT_MAX ||
p_image->x1 > (OPJ_UINT32)INT_MAX ||
p_image->y1 > (OPJ_UINT32)INT_MAX) {
opj_event_msg(p_manager, EVT_ERROR,
"Image coordinates above INT_MAX are not supported\n");
return OPJ_FALSE;
}
l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
(OPJ_INT32)l_img_comp->dx); (OPJ_INT32)l_img_comp->dx);