diff options
| author | Remi Collet <remi@remirepo.net> | 2017-10-04 17:40:12 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-10-04 17:40:12 +0200 |
| commit | 797aab3e2e4f2c8489f97a00b1d2fef2f12608d5 (patch) | |
| tree | dc0237335c0d6cc4d5baa7a1240a6372f6b8a3d6 /4241ae6fbbf1de9658764a80944dc8108f2b4154.patch | |
import from Fedora
Diffstat (limited to '4241ae6fbbf1de9658764a80944dc8108f2b4154.patch')
| -rw-r--r-- | 4241ae6fbbf1de9658764a80944dc8108f2b4154.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/4241ae6fbbf1de9658764a80944dc8108f2b4154.patch b/4241ae6fbbf1de9658764a80944dc8108f2b4154.patch new file mode 100644 index 0000000..d165090 --- /dev/null +++ b/4241ae6fbbf1de9658764a80944dc8108f2b4154.patch @@ -0,0 +1,35 @@ +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 */ |