projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0e83a1
)
opj_t1_ht_decode_cblk(): avoid memcpy() with 0-input size and nullptr destination...
1492/head
author
headshog
<craaaaaachind@gmail.com>
Wed, 6 Dec 2023 14:57:41 +0000
(17:57 +0300)
committer
Even Rouault
<even.rouault@spatialys.com>
Fri, 8 Dec 2023 14:24:28 +0000
(15:24 +0100)
src/lib/openjp2/ht_dec.c
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/ht_dec.c
b/src/lib/openjp2/ht_dec.c
index 120d7e49a17d2195beb7360de4b4301472dfb815..9ea061f37478dd8aa70b42a4cf910a0cac28722d 100644
(file)
--- 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);