diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-06 01:19:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-21 10:42:51 +0100 |
| commit | 50ee16431c56562225cde14f4250e60e86dbfd9c (patch) | |
| tree | 1a89f8ea4a2e7e35dfe1e8e181a4581ada4e20e9 | |
| parent | ff8ba749b439cd1c232cd7f30ba5e4e1d3d8c20a (diff) | |
| download | ffmpeg-50ee16431c56562225cde14f4250e60e86dbfd9c.tar.gz | |
avcodec/clearvideo: Check remaining input bits in P macro block loop
Fixes: Timeout
Fixes: 11083/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CLEARVIDEO_fuzzer-5657180351496192
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 7aaab127bebb33003105a620736d6cae8c45a6e5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/clearvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 6061cb571e..5e2f019929 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -573,6 +573,8 @@ static int clv_decode_frame(AVCodecContext *avctx, void *data, for (j = 0; j < c->pmb_height; j++) { for (i = 0; i < c->pmb_width; i++) { + if (get_bits_left(&c->gb) <= 0) + return AVERROR_INVALIDDATA; if (get_bits1(&c->gb)) { MV mv = mvi_predict(&c->mvi, i, j, zero_mv); |