Merge pull request #1366 from sebras/fix-out-of-bounds-access

opj_j2k_is_imf_compliant: Fix out of bounds access
This commit is contained in:
Even Rouault 2021-07-12 15:58:06 +02:00 committed by GitHub
commit 67f8a1e430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions

View File

@ -7101,7 +7101,8 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
mainlevel);
ret = OPJ_FALSE;
}
else
{
/* Validate sublevel */
assert(sizeof(tabMaxSubLevelFromMainLevel) ==
(OPJ_IMF_MAINLEVEL_MAX + 1) * sizeof(tabMaxSubLevelFromMainLevel[0]));
@ -7115,6 +7116,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
sublevel);
ret = OPJ_FALSE;
}
}
/* Number of components */
if (image->numcomps > 3) {