2020-11-28 22:49:27 +00:00
|
|
|
diff -rupN --no-dereference openjpeg-2.3.1/src/lib/openjp2/j2k.c openjpeg-2.3.1-new/src/lib/openjp2/j2k.c
|
|
|
|
--- openjpeg-2.3.1/src/lib/openjp2/j2k.c 2019-04-02 14:45:15.000000000 +0200
|
|
|
|
+++ openjpeg-2.3.1-new/src/lib/openjp2/j2k.c 2020-11-28 23:29:38.618863089 +0100
|
|
|
|
@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
|
2020-10-15 20:20:13 +00:00
|
|
|
l_img_comp = p_image->comps;
|
|
|
|
for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
|
|
|
|
OPJ_INT32 l_h, l_w;
|
|
|
|
+ if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
|
|
|
|
+ p_image->y0 > (OPJ_UINT32)INT_MAX ||
|
|
|
|
+ p_image->x1 > (OPJ_UINT32)INT_MAX ||
|
|
|
|
+ p_image->y1 > (OPJ_UINT32)INT_MAX) {
|
|
|
|
+ opj_event_msg(p_manager, EVT_ERROR,
|
|
|
|
+ "Image coordinates above INT_MAX are not supported\n");
|
|
|
|
+ return OPJ_FALSE;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
|
|
|
|
(OPJ_INT32)l_img_comp->dx);
|