opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX... 1229/head
authorEven Rouault <even.rouault@spatialys.com>
Sat, 11 Jan 2020 00:51:19 +0000 (01:51 +0100)
committerEven Rouault <even.rouault@spatialys.com>
Sat, 11 Jan 2020 00:51:58 +0000 (01:51 +0100)
src/lib/openjp2/j2k.c

index 14f6ff41a4c1a14fa6cdb76135ae1b155617c81c..922550eb134475268077d604b6f455dcf46a2fcc 100644 (file)
@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
     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);