summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorheadshog <craaaaaachind@gmail.com>2023-12-06 17:57:41 +0300
committerEven Rouault <even.rouault@spatialys.com>2023-12-08 15:24:28 +0100
commit478b20d9234d6f856cbb4a2a67ee858dc99293d5 (patch)
tree43c82421bf21960bd931c09b2a66fc0eb8d6c3d0 /src/lib
parentb0e83a1b3399f5f847250bdc044a96f22cb156d7 (diff)
opj_t1_ht_decode_cblk(): avoid memcpy() with 0-input size and nullptr destination. fix ht_dec.c:1215 (#1492)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/ht_dec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c
index 120d7e49..9ea061f3 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);