From 77174a698c856393e2f702666db8abb8b352c389 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 21:30:13 +0800 Subject: [PATCH 1/3] [patch tracking] 20201123213007644018 - https://github.com/uclouvain/openjpeg/commit/67ec360f48aeded95d06578e717bdf40a8e6d16f --- ...360f48aeded95d06578e717bdf40a8e6d16f.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 67ec360f48aeded95d06578e717bdf40a8e6d16f.patch diff --git a/67ec360f48aeded95d06578e717bdf40a8e6d16f.patch b/67ec360f48aeded95d06578e717bdf40a8e6d16f.patch new file mode 100644 index 0000000..ae80320 --- /dev/null +++ b/67ec360f48aeded95d06578e717bdf40a8e6d16f.patch @@ -0,0 +1,22 @@ +diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c +index a850f4ff8..1bea54b0d 100644 +--- a/src/lib/openjp2/t1.c ++++ b/src/lib/openjp2/t1.c +@@ -2124,7 +2124,7 @@ typedef struct { + * @param user_data Pointer to a opj_t1_cblk_encode_processing_job_t* structure + * @param tls TLS handle. + */ +-static void opj_t1_clbl_encode_processor(void* user_data, opj_tls_t* tls) ++static void opj_t1_cblk_encode_processor(void* user_data, opj_tls_t* tls) + { + opj_t1_cblk_encode_processing_job_t* job = + (opj_t1_cblk_encode_processing_job_t*)user_data; +@@ -2316,7 +2316,7 @@ OPJ_BOOL opj_t1_encode_cblks(opj_tcd_t* tcd, + job->mct_numcomps = mct_numcomps; + job->pret = &ret; + job->mutex = mutex; +- opj_thread_pool_submit_job(tp, opj_t1_clbl_encode_processor, job); ++ opj_thread_pool_submit_job(tp, opj_t1_cblk_encode_processor, job); + + } /* cblkno */ + } /* precno */ -- Gitee From c1577ef22568fa1c9d5108ae37fd63ad65a9ac0e Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 21:30:13 +0800 Subject: [PATCH 2/3] [patch tracking] 20201123213007644018 - https://github.com/uclouvain/openjpeg/commit/eaa098b59b346cb88e4d10d505061f669d7134fc --- eaa098b59b346cb88e4d10d505061f669d7134fc.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 eaa098b59b346cb88e4d10d505061f669d7134fc.patch diff --git a/eaa098b59b346cb88e4d10d505061f669d7134fc.patch b/eaa098b59b346cb88e4d10d505061f669d7134fc.patch new file mode 100644 index 0000000..77bc17e --- /dev/null +++ b/eaa098b59b346cb88e4d10d505061f669d7134fc.patch @@ -0,0 +1,17 @@ +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index 810f83ec3..1926f6f03 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -1243,9 +1243,11 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t * + + /* +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */ + /* and actually +2 required for https://github.com/uclouvain/openjpeg/issues/982 */ ++ /* and +7 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 3) */ ++ /* and +26 for https://github.com/uclouvain/openjpeg/issues/1283 (-M 7) */ + /* TODO: is there a theoretical upper-bound for the compressed code */ + /* block size ? */ +- l_data_size = 2 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) * ++ l_data_size = 26 + (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) { -- Gitee From 65e87fb4dd72d7ba5787814a67a157692fa0771d Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 21:30:14 +0800 Subject: [PATCH 3/3] [patch tracking] 20201123213007644018 - update spec file --- openjpeg2.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/openjpeg2.spec b/openjpeg2.spec index e4f0659..8720954 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,8 @@ Patch1: openjpeg2_opj2.patch Patch6000: CVE-2016-10505.patch Patch6001: CVE-2016-7445.patch Patch6002: CVE-2020-15389.patch +Patch6003: 67ec360f48aeded95d06578e717bdf40a8e6d16f.patch +Patch6004: eaa098b59b346cb88e4d10d505061f669d7134fc.patch BuildRequires: cmake gcc-c++ make zlib-devel libpng-devel libtiff-devel lcms2-devel doxygen @@ -87,6 +89,9 @@ mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump. %{_mandir}/man3/*.3* %changelog +* 20201123213007644018 patch-tracking 2.3.1-4 +- append patch file of upstream repository from <67ec360f48aeded95d06578e717bdf40a8e6d16f> to + * Sat Jul 25 2020 zhangnaru -2.3.1-3 - fix CVE-2020-15389 @@ -94,4 +99,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 - 2.3.1-1 -- Package init +- Package init \ No newline at end of file -- Gitee