From 649298dcf84b2f20cfe458d887c1591db47372a6 Mon Sep 17 00:00:00 2001 From: yuan Date: Wed, 25 Nov 2020 20:41:39 +0800 Subject: [PATCH] Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283) Upstream-Status: Backport [https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/openjpeg2/2.3.1-1ubuntu4.20.04.1/openjpeg2_2.3.1-1ubuntu4.20.04.1.debian.tar.xz] CVE: CVE-2020-27814 Signed-off-by: Virendra Thakur --- src/lib/openjp2/tcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -1238,10 +1238,12 @@ static OPJ_BOOL opj_tcd_code_block_enc_a /* 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) {