Pullup ticket #6193 - requested by nia
graphics/openjpeg: security fix

Revisions pulled up:
- graphics/openjpeg/Makefile                                    1.21
- graphics/openjpeg/distinfo                                    1.18
- graphics/openjpeg/patches/patch-src_lib_openjp2_j2k.c         1.1
- graphics/openjpeg/patches/patch-src_lib_openjp2_tcd.c         1.1

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Tue May 12 10:44:46 UTC 2020

   Modified Files:
   	pkgsrc/graphics/openjpeg: Makefile distinfo
   Added Files:
   	pkgsrc/graphics/openjpeg/patches: patch-src_lib_openjp2_j2k.c
   	    patch-src_lib_openjp2_tcd.c

   Log Message:
   openjpeg: Cherrypick fixes for the following CVEs from upstream:

   https://nvd.nist.gov/vuln/detail/CVE-2020-6851 - out-of-bounds-write
   https://nvd.nist.gov/vuln/detail/CVE-2020-8112 - heap-overflow

   Please make releases for your software. :/

   Bump PKGREVISION


(bsiegert)

$NetBSD: patch-src_lib_openjp2_j2k.c,v 1.1.2.2 2020/05/13 13:49:08 bsiegert Exp $

CVE-2020-6851
https://github.com/uclouvain/openjpeg/commit/d7064fad0f8a2b485c4b520697e6741c6d94f5c5.patch

--- src/lib/openjp2/j2k.c.orig	2019-04-02 12:45:15.000000000 +0000
+++ src/lib/openjp2/j2k.c
@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
     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);

$NetBSD: patch-src_lib_openjp2_tcd.c,v 1.1.2.2 2020/05/13 13:49:08 bsiegert Exp $

CVE-2020-8112
https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch

--- src/lib/openjp2/tcd.c.orig	2019-04-02 12:45:15.000000000 +0000
+++ src/lib/openjp2/tcd.c
@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile
             /* 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)((