diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-12-19 22:26:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-01-13 23:06:10 +0100 |
| commit | 5650737134204ad71a59ff7350ba1b1dfc518fd4 (patch) | |
| tree | 9117fbe4262e6fdb7a2595d338e7ac567d75efd9 /libavcodec | |
| parent | 3541d4960b58eb8e2e762e6c8e0629a52c053e5d (diff) | |
| download | ffmpeg-5650737134204ad71a59ff7350ba1b1dfc518fd4.tar.gz | |
avcodec/vqavideo: reset accounting on error
Fixes: Timeout (same growing chunk is decoded to failure repeatedly)
Fixes: 42582/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-6531195591065600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d8ea7a67ba62f5d4520e75e56b9954d80e7ff223)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vqavideo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 00229b6228..87c45ba9cd 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -592,13 +592,14 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) if (s->partial_countdown <= 0) { bytestream2_init(&s->gb, s->next_codebook_buffer, s->next_codebook_buffer_index); /* decompress codebook */ - if ((res = decode_format80(s, s->next_codebook_buffer_index, - s->codebook, s->codebook_size, 0)) < 0) - return res; + res = decode_format80(s, s->next_codebook_buffer_index, + s->codebook, s->codebook_size, 0); /* reset accounting */ s->next_codebook_buffer_index = 0; s->partial_countdown = s->partial_count; + if (res < 0) + return res; } } |