From ee13f974684ccea88ff3cbc150c35532fd53f5c7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 29 Jan 2020 04:14:52 -0500
Subject: [PATCH] import openjpeg2-2.3.1-2.el8_1

---
 SOURCES/openjpeg2_CVE-2020-6851.patch | 32 +++++++++++++++++++++++++++
 SPECS/openjpeg2.spec                  |  8 ++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/openjpeg2_CVE-2020-6851.patch

diff --git a/SOURCES/openjpeg2_CVE-2020-6851.patch b/SOURCES/openjpeg2_CVE-2020-6851.patch
new file mode 100644
index 0000000..4a2029b
--- /dev/null
+++ b/SOURCES/openjpeg2_CVE-2020-6851.patch
@@ -0,0 +1,32 @@
+From 36dc8ffca8c085423149bb028da5688936c88c68 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 4169cd6..9e9a30f 100644
+--- a/src/lib/openjp2/j2k.c
++++ b/src/lib/openjp2/j2k.c
+@@ -9236,6 +9236,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);
+-- 
+2.21.1
+
diff --git a/SPECS/openjpeg2.spec b/SPECS/openjpeg2.spec
index 071c76b..c8bc1cd 100644
--- a/SPECS/openjpeg2.spec
+++ b/SPECS/openjpeg2.spec
@@ -5,7 +5,7 @@
 
 Name:           openjpeg2
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C-Library for JPEG 2000
 
 # windirent.h is MIT, the rest is BSD
@@ -22,6 +22,9 @@ Patch0:         openjpeg2_remove-thirdparty.patch
 # Rename tool names to avoid conflicts with openjpeg-1.x
 Patch1:         openjpeg2_opj2.patch
 
+# Fix for CVE-2020-6851
+Patch2:         openjpeg2_CVE-2020-6851.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  make
@@ -325,6 +328,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Tue Jan 14 2020 Nikola Forró <nforro@redhat.com> - 2.3.1-2
+- Fix CVE-2020-6851 (#1790589)
+
 * Fri May 31 2019 Nikola Forró <nforro@redhat.com> - 2.3.1-1
 - Rebase to 2.3.1 (#1704255)