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

opj_tcd_mct_decode(): fix checks to verify MCT can be done safely. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3305 (master only)

This commit is contained in:
Even Rouault 2017-09-07 15:32:54 +02:00
parent c67e1cd73f
commit cc893a4ebf
1 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/lib/openjp2/tcd.c
View File

@ -1965,43 +1965,62 @@ static OPJ_BOOL opj_tcd_mct_decode(opj_tcd_t *p_tcd, opj_event_mgr_t *p_manager)
} }
if (p_tcd->whole_tile_decoding) { if (p_tcd->whole_tile_decoding) {
opj_tcd_resolution_t* res_comp0 = l_tile->comps[0].resolutions +
l_tile_comp->minimum_num_resolutions - 1;
opj_tcd_resolution_t* res_comp1 = l_tile->comps[1].resolutions +
l_tile_comp->minimum_num_resolutions - 1;
opj_tcd_resolution_t* res_comp2 = l_tile->comps[2].resolutions +
l_tile_comp->minimum_num_resolutions - 1;
/* A bit inefficient: we process more data than needed if */ /* A bit inefficient: we process more data than needed if */
/* resno_decoded < l_tile_comp->minimum_num_resolutions-1, */ /* resno_decoded < l_tile_comp->minimum_num_resolutions-1, */
/* but we would need to take into account a stride then */ /* but we would need to take into account a stride then */
l_samples = (OPJ_UINT32)(( l_samples = (OPJ_UINT32)((res_comp0->x1 - res_comp0->x0) *
l_tile_comp->resolutions[l_tile_comp->minimum_num_resolutions - 1].x1 - (res_comp0->y1 - res_comp0->y0));
l_tile_comp->resolutions[l_tile_comp->minimum_num_resolutions - 1].x0) * if (l_tile->numcomps >= 3) {
(l_tile_comp->resolutions[l_tile_comp->minimum_num_resolutions - 1].y1 - /* testcase 1336.pdf.asan.47.376 */
l_tile_comp->resolutions[l_tile_comp->minimum_num_resolutions - 1].y0)); if (p_tcd->image->comps[0].resno_decoded !=
p_tcd->image->comps[1].resno_decoded ||
p_tcd->image->comps[0].resno_decoded !=
p_tcd->image->comps[2].resno_decoded ||
(OPJ_SIZE_T)(res_comp1->x1 - res_comp1->x0) *
(OPJ_SIZE_T)(res_comp1->y1 - res_comp1->y0) != l_samples ||
(OPJ_SIZE_T)(res_comp2->x1 - res_comp2->x0) *
(OPJ_SIZE_T)(res_comp2->y1 - res_comp2->y0) != l_samples) {
opj_event_msg(p_manager, EVT_ERROR,
"Tiles don't all have the same dimension. Skip the MCT step.\n");
return OPJ_FALSE;
}
}
} else { } else {
opj_tcd_resolution_t* l_res;
l_res = l_tile_comp->resolutions + p_tcd->image->comps[0].resno_decoded;
l_samples = (l_res->win_x1 - l_res->win_x0) *
(l_res->win_y1 - l_res->win_y0);
}
if (l_tile->numcomps >= 3) {
opj_tcd_resolution_t* res_comp0 = l_tile->comps[0].resolutions + opj_tcd_resolution_t* res_comp0 = l_tile->comps[0].resolutions +
p_tcd->image->comps[0].resno_decoded; p_tcd->image->comps[0].resno_decoded;
opj_tcd_resolution_t* res_comp1 = l_tile->comps[1].resolutions + opj_tcd_resolution_t* res_comp1 = l_tile->comps[1].resolutions +
p_tcd->image->comps[1].resno_decoded; p_tcd->image->comps[1].resno_decoded;
opj_tcd_resolution_t* res_comp2 = l_tile->comps[2].resolutions + opj_tcd_resolution_t* res_comp2 = l_tile->comps[2].resolutions +
p_tcd->image->comps[2].resno_decoded; p_tcd->image->comps[2].resno_decoded;
OPJ_SIZE_T l_res_samples = (OPJ_SIZE_T)(res_comp0->x1 - res_comp0->x0) *
(OPJ_SIZE_T)(res_comp0->y1 - res_comp0->y0); l_samples = (res_comp0->win_x1 - res_comp0->win_x0) *
/* testcase 1336.pdf.asan.47.376 */ (res_comp0->win_y1 - res_comp0->win_y0);
if (p_tcd->image->comps[0].resno_decoded != if (l_tile->numcomps >= 3) {
p_tcd->image->comps[1].resno_decoded || /* testcase 1336.pdf.asan.47.376 */
p_tcd->image->comps[0].resno_decoded != if (p_tcd->image->comps[0].resno_decoded !=
p_tcd->image->comps[2].resno_decoded || p_tcd->image->comps[1].resno_decoded ||
(OPJ_SIZE_T)(res_comp1->x1 - res_comp1->x0) * p_tcd->image->comps[0].resno_decoded !=
(OPJ_SIZE_T)(res_comp1->y1 - res_comp1->y0) != l_res_samples || p_tcd->image->comps[2].resno_decoded ||
(OPJ_SIZE_T)(res_comp2->x1 - res_comp2->x0) * (OPJ_SIZE_T)(res_comp1->win_x1 - res_comp1->win_x0) *
(OPJ_SIZE_T)(res_comp2->y1 - res_comp2->y0) != l_res_samples) { (OPJ_SIZE_T)(res_comp1->win_y1 - res_comp1->win_y0) != l_samples ||
opj_event_msg(p_manager, EVT_ERROR, (OPJ_SIZE_T)(res_comp2->win_x1 - res_comp2->win_x0) *
"Tiles don't all have the same dimension. Skip the MCT step.\n"); (OPJ_SIZE_T)(res_comp2->win_y1 - res_comp2->win_y0) != l_samples) {
return OPJ_FALSE; opj_event_msg(p_manager, EVT_ERROR,
} else if (l_tcp->mct == 2) { "Tiles don't all have the same dimension. Skip the MCT step.\n");
return OPJ_FALSE;
}
}
}
if (l_tile->numcomps >= 3) {
if (l_tcp->mct == 2) {
OPJ_BYTE ** l_data; OPJ_BYTE ** l_data;
if (! l_tcp->m_mct_decoding_matrix) { if (! l_tcp->m_mct_decoding_matrix) {