From 939181a587ddc1093c59e2b5404c16bd195725f8 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 17 Jan 2020 20:32:16 +0100
Subject: [PATCH] Backport patch for CVE 2020-6851

---
 openjpeg2.spec                |  8 +++++++-
 openjpeg2_CVE-2020-6851.patch | 29 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 openjpeg2_CVE-2020-6851.patch

diff --git a/openjpeg2.spec b/openjpeg2.spec
index 564a610..e2ac62f 100644
--- a/openjpeg2.spec
+++ b/openjpeg2.spec
@@ -8,7 +8,7 @@
 
 Name:           openjpeg2
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C-Library for JPEG 2000
 
 # windirent.h is MIT, the rest is BSD
@@ -22,6 +22,9 @@ Source1:        data.tar.xz
 
 # Rename tool names to avoid conflicts with openjpeg-1.x
 Patch0:         openjpeg2_opj2.patch
+# Backport patch for CVE 2020-6851
+# https://github.com/uclouvain/openjpeg/issues/1228
+Patch1:         openjpeg2_CVE-2020-6851.patch
 
 
 BuildRequires:  cmake
@@ -328,6 +331,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Fri Jan 17 2020 Sandro Mani <manisandro@gmail.com> - 2.3.1-4
+- Backport patch for CVE 2020-6851
+
 * Wed Oct 02 2019 Sandro Mani <manisandro@gmail.com> - 2.3.1-3
 - Fix unbundling 3rd party libraries (#1757822)
 
diff --git a/openjpeg2_CVE-2020-6851.patch b/openjpeg2_CVE-2020-6851.patch
new file mode 100644
index 0000000..9a70291
--- /dev/null
+++ b/openjpeg2_CVE-2020-6851.patch
@@ -0,0 +1,29 @@
+From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 11 Jan 2020 01:51:19 +0100
+Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
+ coordinates are beyond INT_MAX (fixes #1228)
+
+---
+ src/lib/openjp2/j2k.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
+index 14f6ff41a..922550eb1 100644
+--- 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);