opj_t1_ht_decode_cblk(): avoid memcpy() with 0-input size and nullptr…

… destination. fix ht_dec.c:1215 (#1492)
uclouvain · Dec 8, 2023 · 478b20d · 478b20d
1 parent b0e83a1
commit 478b20d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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);