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:12 +0100 |
| commit | 357c339a84d2c340677bd5923b678221f227b36c (patch) | |
| tree | 66bf1e0d1ca96828a58e3ff2de1f26cb1c65ad28 | |
| parent | 9b5d10d744d7f50b04fa14d44fc1720eb5a2b2b9 (diff) | |
| download | ffmpeg-357c339a84d2c340677bd5923b678221f227b36c.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>
| -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 0e42cbb254..fa4cf2c880 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; } } |