Skip to content

Commit

Permalink
opj_j2k_is_imf_compliant: Fix out of bounds access.
Browse files Browse the repository at this point in the history 
Previously when mainlevel was parsed == 12 openjpeg would generate
a warning, but then the sublevel value would be compared to an out
of bounds element in the tabMaxSubLevelFromMainLevel array.

Judging by the code, what commit 84f3beb
probably meant to do was to use early return whenever a non-IMF
compliant stream was detected. This commit uses that approach, thus
avoiding the out of bounds access after the initial warning.
  • Loading branch information
@sebras
sebras committed Jul 12, 2021
1 parent c8ab3e5 commit fccfe02
Showing 1 changed file with 38 additions and 39 deletions.
77 changes: 38 additions & 39 deletions src/lib/openjp2/j2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7090,7 +7090,6 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
const int NL = parameters->numresolution - 1;
const OPJ_UINT32 XTsiz = parameters->tile_size_on ? (OPJ_UINT32)
parameters->cp_tdx : image->x1;
OPJ_BOOL ret = OPJ_TRUE;

/* Validate mainlevel */
if (mainlevel > OPJ_IMF_MAINLEVEL_MAX) {
Expand All @@ -7099,7 +7098,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> %d is thus not compliant\n"
"-> Non-IMF codestream will be generated\n",
mainlevel);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

/* Validate sublevel */
Expand All @@ -7113,7 +7112,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
tabMaxSubLevelFromMainLevel[mainlevel],
mainlevel,
sublevel);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

/* Number of components */
Expand All @@ -7123,7 +7122,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of components of input image (%d) is not compliant\n"
"-> Non-IMF codestream will be generated\n",
image->numcomps);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (image->x0 != 0 || image->y0 != 0) {
Expand All @@ -7132,7 +7131,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> %d,%d is not compliant\n"
"-> Non-IMF codestream will be generated\n",
image->x0, image->y0 != 0);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (parameters->cp_tx0 != 0 || parameters->cp_ty0 != 0) {
Expand All @@ -7141,7 +7140,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> %d,%d is not compliant\n"
"-> Non-IMF codestream will be generated\n",
parameters->cp_tx0, parameters->cp_ty0);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (parameters->tile_size_on) {
Expand All @@ -7158,7 +7157,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
parameters->cp_tdy,
image->x1,
image->y1);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else {
if ((OPJ_UINT32)parameters->cp_tdx >= image->x1 &&
Expand Down Expand Up @@ -7186,7 +7185,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Non-IMF codestream will be generated\n",
parameters->cp_tdx,
parameters->cp_tdy);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}
}
Expand All @@ -7203,7 +7202,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> At least component %d of input image (%d bits, %s) is not compliant\n"
"-> Non-IMF codestream will be generated\n",
i, image->comps[i].bpp, tmp_str);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}

Expand All @@ -7214,30 +7213,30 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF profiles require XRSiz1 == 1. Here it is set to %d.\n"
"-> Non-IMF codestream will be generated\n",
image->comps[i].dx);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
if (i == 1 && image->comps[i].dx != 1 && image->comps[i].dx != 2) {
opj_event_msg(p_manager, EVT_WARNING,
"IMF profiles require XRSiz2 == 1 or 2. Here it is set to %d.\n"
"-> Non-IMF codestream will be generated\n",
image->comps[i].dx);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
if (i > 1 && image->comps[i].dx != image->comps[i - 1].dx) {
opj_event_msg(p_manager, EVT_WARNING,
"IMF profiles require XRSiz%d to be the same as XRSiz2. "
"Here it is set to %d instead of %d.\n"
"-> Non-IMF codestream will be generated\n",
i + 1, image->comps[i].dx, image->comps[i - 1].dx);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
if (image->comps[i].dy != 1) {
opj_event_msg(p_manager, EVT_WARNING,
"IMF profiles require YRsiz == 1. "
"Here it is set to %d for component %d.\n"
"-> Non-IMF codestream will be generated\n",
image->comps[i].dy, i);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}

Expand All @@ -7252,7 +7251,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Input image size %d x %d is not compliant\n"
"-> Non-IMF codestream will be generated\n",
image->comps[0].w, image->comps[0].h);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
case OPJ_PROFILE_IMF_4K:
Expand All @@ -7264,7 +7263,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Input image size %d x %d is not compliant\n"
"-> Non-IMF codestream will be generated\n",
image->comps[0].w, image->comps[0].h);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
case OPJ_PROFILE_IMF_8K:
Expand All @@ -7276,7 +7275,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Input image size %d x %d is not compliant\n"
"-> Non-IMF codestream will be generated\n",
image->comps[0].w, image->comps[0].h);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
default :
Expand All @@ -7289,7 +7288,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF profile forbid RGN / region of interest marker.\n"
"-> Compression parameters specify a ROI\n"
"-> Non-IMF codestream will be generated\n");
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (parameters->cblockw_init != 32 || parameters->cblockh_init != 32) {
Expand All @@ -7299,7 +7298,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Non-IMF codestream will be generated\n",
parameters->cblockw_init,
parameters->cblockh_init);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (parameters->prog_order != OPJ_CPRL) {
Expand All @@ -7308,7 +7307,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Compression parameters set it to %d.\n"
"-> Non-IMF codestream will be generated\n",
parameters->prog_order);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (parameters->numpocs != 0) {
Expand All @@ -7317,7 +7316,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Compression parameters set %d POC.\n"
"-> Non-IMF codestream will be generated\n",
parameters->numpocs);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

/* Codeblock style: no mode switch enabled */
Expand All @@ -7327,7 +7326,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Compression parameters set code block style to %d.\n"
"-> Non-IMF codestream will be generated\n",
parameters->mode);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

if (profile == OPJ_PROFILE_IMF_2K ||
Expand All @@ -7339,7 +7338,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF 2K/4K/8K profiles require 9-7 Irreversible Transform.\n"
"-> Compression parameters set it to reversible.\n"
"-> Non-IMF codestream will be generated\n");
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else {
/* Expect 5-3 transform */
Expand All @@ -7348,7 +7347,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF 2K/4K/8K profiles require 5-3 reversible Transform.\n"
"-> Compression parameters set it to irreversible.\n"
"-> Non-IMF codestream will be generated\n");
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}

Expand All @@ -7359,7 +7358,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of layers is %d.\n"
"-> Non-IMF codestream will be generated\n",
parameters->tcp_numlayers);
ret = OPJ_FALSE;
return OPJ_FALSE;
}

/* Decomposition levels */
Expand All @@ -7371,7 +7370,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
case OPJ_PROFILE_IMF_4K:
Expand All @@ -7381,7 +7380,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
case OPJ_PROFILE_IMF_8K:
Expand All @@ -7391,7 +7390,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
break;
case OPJ_PROFILE_IMF_2K_R: {
Expand All @@ -7402,7 +7401,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 1024) {
if (!(NL >= 1 && NL <= 4)) {
Expand All @@ -7411,7 +7410,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}
break;
Expand All @@ -7424,7 +7423,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 2048) {
if (!(NL >= 1 && NL <= 5)) {
Expand All @@ -7433,7 +7432,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 1024) {
if (!(NL >= 1 && NL <= 4)) {
Expand All @@ -7442,7 +7441,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}
break;
Expand All @@ -7455,7 +7454,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 4096) {
if (!(NL >= 1 && NL <= 6)) {
Expand All @@ -7464,7 +7463,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 2048) {
if (!(NL >= 1 && NL <= 5)) {
Expand All @@ -7473,7 +7472,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else if (XTsiz >= 1024) {
if (!(NL >= 1 && NL <= 4)) {
Expand All @@ -7482,7 +7481,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"-> Number of decomposition levels is %d.\n"
"-> Non-IMF codestream will be generated\n",
NL);
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}
break;
Expand All @@ -7499,7 +7498,7 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF profiles require PPx = PPy = 7 for NLLL band, else 8.\n"
"-> Supplied values are different from that.\n"
"-> Non-IMF codestream will be generated\n");
ret = OPJ_FALSE;
return OPJ_FALSE;
}
} else {
int i;
Expand All @@ -7510,12 +7509,12 @@ static OPJ_BOOL opj_j2k_is_imf_compliant(opj_cparameters_t *parameters,
"IMF profiles require PPx = PPy = 7 for NLLL band, else 8.\n"
"-> Supplied values are different from that.\n"
"-> Non-IMF codestream will be generated\n");
ret = OPJ_FALSE;
return OPJ_FALSE;
}
}
}

return ret;
return OPJ_TRUE;
}


Expand Down

0 comments on commit fccfe02

Please sign in to comment.