47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
|
https://github.com/uclouvain/openjpeg/commit/afb308b9ccbe129608c9205cf3bb39bbefad90b9.patch
|
||
|
|
http://openwall.com/lists/oss-security/2017/09/06/1
|
||
|
|
|
||
|
|
From afb308b9ccbe129608c9205cf3bb39bbefad90b9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Even Rouault <even.rouault@spatialys.com>
|
||
|
|
Date: Mon, 14 Aug 2017 17:20:37 +0200
|
||
|
|
Subject: [PATCH] Encoder: grow buffer size in
|
||
|
|
opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in
|
||
|
|
opj_mqc_flush (#982)
|
||
|
|
|
||
|
|
---
|
||
|
|
src/lib/openjp2/tcd.c | 7 +++++--
|
||
|
|
tests/nonregression/test_suite.ctest.in | 2 ++
|
||
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
|
||
|
|
index 301c7213e..53cdcf64d 100644
|
||
|
|
--- a/src/lib/openjp2/tcd.c
|
||
|
|
+++ b/src/lib/openjp2/tcd.c
|
||
|
|
@@ -1187,8 +1187,11 @@ static OPJ_BOOL opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t *
|
||
|
|
{
|
||
|
|
OPJ_UINT32 l_data_size;
|
||
|
|
|
||
|
|
- /* The +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */
|
||
|
|
- l_data_size = 1 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
|
||
|
|
+ /* +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */
|
||
|
|
+ /* and actually +2 required for https://github.com/uclouvain/openjpeg/issues/982 */
|
||
|
|
+ /* 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) *
|
||
|
|
(p_code_block->y1 - p_code_block->y0) * (OPJ_INT32)sizeof(OPJ_UINT32));
|
||
|
|
|
||
|
|
if (l_data_size > p_code_block->data_size) {
|
||
|
|
diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
|
||
|
|
index aaf40d7d0..ffd964c2a 100644
|
||
|
|
--- a/tests/nonregression/test_suite.ctest.in
|
||
|
|
+++ b/tests/nonregression/test_suite.ctest.in
|
||
|
|
@@ -169,6 +169,8 @@ opj_compress -i @INPUT_NR_PATH@/Bretagne2.ppm -o @TEMP_PATH@/Bretagne2_empty_ban
|
||
|
|
# Same rate as Bretagne2_4.j2k
|
||
|
|
opj_compress -i @INPUT_NR_PATH@/Bretagne2.ppm -o @TEMP_PATH@/Bretagne2_empty_band_r800.j2k -t 2591,1943 -n 2 -r 800
|
||
|
|
|
||
|
|
+opj_compress -i @INPUT_NR_PATH@/issue982.bmp -o @TEMP_PATH@/issue982.j2k -n 1
|
||
|
|
+
|
||
|
|
# DECODER TEST SUITE
|
||
|
|
opj_decompress -i @INPUT_NR_PATH@/Bretagne2.j2k -o @TEMP_PATH@/Bretagne2.j2k.pgx
|
||
|
|
opj_decompress -i @INPUT_NR_PATH@/_00042.j2k -o @TEMP_PATH@/_00042.j2k.pgx
|