From 1beab566b0e7a9ba1b0d58afccffc85a6b45cd6a Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 26 Nov 2020 00:30:12 +0800
Subject: [PATCH 1/2] [patch tracking] 20201126003007645119 -
 https://github.com/uclouvain/openjpeg/commit/0c0f27f17d431d98d190f30bec3879f434512158

---
 ...27f17d431d98d190f30bec3879f434512158.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 0c0f27f17d431d98d190f30bec3879f434512158.patch

diff --git a/0c0f27f17d431d98d190f30bec3879f434512158.patch b/0c0f27f17d431d98d190f30bec3879f434512158.patch
new file mode 100644
index 0000000..c4fd92d
--- /dev/null
+++ b/0c0f27f17d431d98d190f30bec3879f434512158.patch
@@ -0,0 +1,19 @@
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index cb305a63b..edc2f416f 100644
+--- a/src/lib/openjp2/tcd.c
++++ b/src/lib/openjp2/tcd.c
+@@ -1246,10 +1246,12 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t *
+     /* and +7 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 3) */
+     /* and +26 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 7) */
+     /* and +28 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 44) */
++    /* and +33 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 4) */
++    /* and +63 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 4 -IMF 2K) */
+     /* TODO: is there a theoretical upper-bound for the compressed code */
+     /* block size ? */
+-    l_data_size = 28 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
+-                                   (p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
++    l_data_size = 63 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
++                                    (p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
+ 
+     if (l_data_size > p_code_block->data_size) {
+         if (p_code_block->data) {
-- 
Gitee


From e326b80904dacde705b1f655bdfcc62de58ce6d7 Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Thu, 26 Nov 2020 00:30:12 +0800
Subject: [PATCH 2/2] [patch tracking] 20201126003007645119 - update spec file

---
 openjpeg2.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openjpeg2.spec b/openjpeg2.spec
index e4f0659..0f395a0 100644
--- a/openjpeg2.spec
+++ b/openjpeg2.spec
@@ -1,6 +1,6 @@
 Name:           openjpeg2
 Version:        2.3.1
-Release:        3
+Release:        4
 Summary:        C-Library for JPEG 2000
 License:        BSD and MIT
 URL:            https://github.com/uclouvain/openjpeg
@@ -12,6 +12,7 @@ Patch1:         openjpeg2_opj2.patch
 Patch6000:	CVE-2016-10505.patch
 Patch6001:	CVE-2016-7445.patch
 Patch6002:      CVE-2020-15389.patch
+Patch6003: 0c0f27f17d431d98d190f30bec3879f434512158.patch
 
 BuildRequires:  cmake gcc-c++ make zlib-devel libpng-devel libtiff-devel lcms2-devel doxygen
 
@@ -87,6 +88,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump.
 %{_mandir}/man3/*.3*
 
 %changelog
+* 20201126003007645119 patch-tracking 2.3.1-4
+- append patch file of upstream repository from <0c0f27f17d431d98d190f30bec3879f434512158> to <0c0f27f17d431d98d190f30bec3879f434512158>
+
 * Sat Jul 25 2020 zhangnaru <zhangnaru@huawei.com> -2.3.1-3
 - fix CVE-2020-15389 
 
@@ -94,4 +98,4 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump.
 - fix CVE-2016-10505 and CVE-2016-7445
 
 * Thu Sep 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.1-1
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee