From 478b20d9234d6f856cbb4a2a67ee858dc99293d5 Mon Sep 17 00:00:00 2001 From: headshog Date: Wed, 6 Dec 2023 17:57:41 +0300 Subject: [PATCH] opj_t1_ht_decode_cblk(): avoid memcpy() with 0-input size and nullptr destination. fix ht_dec.c:1215 (#1492) --- src/lib/openjp2/ht_dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c index 120d7e49a..9ea061f37 100644 --- a/src/lib/openjp2/ht_dec.c +++ b/src/lib/openjp2/ht_dec.c @@ -1210,6 +1210,9 @@ OPJ_BOOL opj_t1_ht_decode_cblk(opj_t1_t *t1, /* Concatenate all chunks */ cblkdata = t1->cblkdatabuffer; + if (cblkdata == NULL) { + return OPJ_FALSE; + } cblk_len = 0; for (i = 0; i < cblk->numchunks; i++) { memcpy(cblkdata + cblk_len, cblk->chunks[i].data, cblk->chunks[i].len);