diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-22 15:53:10 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-22 15:57:59 +0000 |
commit | 5b27b635acbe69cadaffce1fbe4b69d8256c1315 (patch) | |
tree | 37602349be5cbfb8392fd7fe7a93ccb1f0b99810 /main/openjpeg/CVE-2017-14152.patch | |
parent | b46a3d4f3d260cbe26431d5da6bf5b1be3ba01f1 (diff) | |
download | aports-5b27b635acbe69cadaffce1fbe4b69d8256c1315.tar.bz2 aports-5b27b635acbe69cadaffce1fbe4b69d8256c1315.tar.xz |
main/openjpeg: security fix for CVE-2017-17480
also remove unused patches
fixes #9679
Diffstat (limited to 'main/openjpeg/CVE-2017-14152.patch')
-rw-r--r-- | main/openjpeg/CVE-2017-14152.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/main/openjpeg/CVE-2017-14152.patch b/main/openjpeg/CVE-2017-14152.patch deleted file mode 100644 index d165090a1a..0000000000 --- a/main/openjpeg/CVE-2017-14152.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4241ae6fbbf1de9658764a80944dc8108f2b4154 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Tue, 15 Aug 2017 11:55:58 +0200 -Subject: [PATCH] Fix assertion in debug mode / heap-based buffer overflow in - opj_write_bytes_LE for Cinema profiles with numresolutions = 1 (#985) - ---- - src/lib/openjp2/j2k.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c -index a2521ebbc..54b490a8c 100644 ---- a/src/lib/openjp2/j2k.c -+++ b/src/lib/openjp2/j2k.c -@@ -6573,10 +6573,16 @@ static void opj_j2k_set_cinema_parameters(opj_cparameters_t *parameters, - - /* Precincts */ - parameters->csty |= 0x01; -- parameters->res_spec = parameters->numresolution - 1; -- for (i = 0; i < parameters->res_spec; i++) { -- parameters->prcw_init[i] = 256; -- parameters->prch_init[i] = 256; -+ if (parameters->numresolution == 1) { -+ parameters->res_spec = 1; -+ parameters->prcw_init[0] = 128; -+ parameters->prch_init[0] = 128; -+ } else { -+ parameters->res_spec = parameters->numresolution - 1; -+ for (i = 0; i < parameters->res_spec; i++) { -+ parameters->prcw_init[i] = 256; -+ parameters->prch_init[i] = 256; -+ } - } - - /* The progression order shall be CPRL */ |