From be1665dbec6f9be4bb702e9debe21da5b5929298 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 9 Aug 2025 11:38:07 +0200 Subject: [PATCH] avcodec/jpeg2000dec: Make sure the 4 extra bytes allocated are initialized Fixes: use of uninitialized memory Fixes: 429130590/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_DEC_fuzzer-5736930522497024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit d6fe3786cd8c06437756d407f727ff01cf1774ff) Signed-off-by: Michael Niedermayer (cherry picked from commit 39f4a60035085e7b1465fa7159d3ef03114dfe27) Signed-off-by: Carlos Henrique Lima Melara --- libavcodec/jpeg2000dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index a04c545669..096a06b79b 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1219,6 +1219,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, bytestream2_get_bufferu(&s->g, cblk->data + cblk->length, cblk->lengthinc[cwsno]); cblk->length += cblk->lengthinc[cwsno]; + memset(cblk->data + cblk->length, 0, 4); cblk->lengthinc[cwsno] = 0; if (cblk->nb_terminationsinc) { cblk->nb_terminationsinc--;