aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-04-09 15:18:55 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-14 17:56:44 +0200
commit5366ae12b9ba60404822f6b39b41f6c0d98a7c8a (patch)
treeb8eff493946b2454c75f5d006ea7e3b687274e93 /libavcodec
parent0ecda4fbce8e77152e9b450c4efa8c1b81c8982e (diff)
downloadffmpeg-5366ae12b9ba60404822f6b39b41f6c0d98a7c8a.tar.gz
avcodec/escape124: Check that blocks are allocated before use
Fixes: NULL pointer dereference Fixes: 57819/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-5077280228769792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/escape124.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index e8a8395f4b..592de09a9f 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -155,7 +155,7 @@ static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb,
// This condition can occur with invalid bitstreams and
// *codebook_index == 2
- if (block_index >= s->codebooks[*codebook_index].size)
+ if (block_index >= s->codebooks[*codebook_index].size || !s->codebooks[*codebook_index].blocks)
return (MacroBlock) { { 0 } };
return s->codebooks[*codebook_index].blocks[block_index];