Haibo Huang | 49cc930 | 2020-04-27 16:14:24 -0700 | [diff] [blame] | 1 | diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c |
| 2 | index 2ae211ef4..9e98f04ab 100644 |
| 3 | --- a/third_party/libopenjpeg20/tcd.c |
| 4 | +++ b/third_party/libopenjpeg20/tcd.c |
| 5 | @@ -910,8 +910,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, |
| 6 | /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ |
| 7 | l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; |
| 8 | l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; |
| 9 | - l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; |
| 10 | - l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; |
| 11 | + { |
| 12 | + OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, |
| 13 | + (OPJ_INT32)l_pdx)) << l_pdx; |
| 14 | + if (tmp > (OPJ_UINT32)INT_MAX) { |
| 15 | + opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); |
| 16 | + return OPJ_FALSE; |
| 17 | + } |
| 18 | + l_br_prc_x_end = (OPJ_INT32)tmp; |
| 19 | + } |
| 20 | + { |
| 21 | + OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, |
| 22 | + (OPJ_INT32)l_pdy)) << l_pdy; |
| 23 | + if (tmp > (OPJ_UINT32)INT_MAX) { |
| 24 | + opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); |
| 25 | + return OPJ_FALSE; |
| 26 | + } |
| 27 | + l_br_prc_y_end = (OPJ_INT32)tmp; |
| 28 | + } |
| 29 | /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ |
| 30 | |
| 31 | l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( |