opj_j2k_update_image_dimensions(): reject images whose coordinates ar…

…e beyond INT_MAX (fixes uclouvain#1228)
rouault · Jan 11, 2020 · d7064fa · d7064fa
1 parent ac37373
commit d7064fa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
@@ -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);