You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.8 KiB
32 lines
1.8 KiB
diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c
|
|
index 2ae211ef4..9e98f04ab 100644
|
|
--- a/third_party/libopenjpeg20/tcd.c
|
|
+++ b/third_party/libopenjpeg20/tcd.c
|
|
@@ -910,8 +910,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
|
|
/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
|
|
l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
|
|
l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
|
|
- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
|
|
- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
|
|
+ {
|
|
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
|
|
+ (OPJ_INT32)l_pdx)) << l_pdx;
|
|
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
+ return OPJ_FALSE;
|
|
+ }
|
|
+ l_br_prc_x_end = (OPJ_INT32)tmp;
|
|
+ }
|
|
+ {
|
|
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
|
|
+ (OPJ_INT32)l_pdy)) << l_pdy;
|
|
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
+ return OPJ_FALSE;
|
|
+ }
|
|
+ l_br_prc_y_end = (OPJ_INT32)tmp;
|
|
+ }
|
|
/*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 );*/
|
|
|
|
l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
|