Index: third_party/libopenjpeg20/tcd.c |
diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c |
index aebe9be96c189b1172cced3c3dab24079daee01f..673633c09bc1601d6d4ea4c6fa59740e5b06d9b7 100644 |
--- a/third_party/libopenjpeg20/tcd.c |
+++ b/third_party/libopenjpeg20/tcd.c |
@@ -822,7 +822,14 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, |
l_res->ph = (l_res->y0 == l_res->y1) ? 0 : (OPJ_UINT32)((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy); |
/*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/ |
+ if (l_res->pw && ((OPJ_UINT32)-1) / l_res->pw < l_res->ph) { |
+ return OPJ_FALSE; |
+ } |
l_nb_precincts = l_res->pw * l_res->ph; |
+ |
+ if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof(opj_tcd_precinct_t) < l_nb_precincts) { |
+ return OPJ_FALSE; |
+ } |
l_nb_precinct_size = l_nb_precincts * (OPJ_UINT32)sizeof(opj_tcd_precinct_t); |
if (resno == 0) { |
tlcbgxstart = l_tl_prc_x_start; |