[FFmpeg-devel,2/2] avcodec/clearvideo: Check remaining input bits in P macro block loop

Submitted by Michael Niedermayer on Dec. 6, 2018, 12:41 a.m.

Details

Message ID 20181206004133.22809-2-michael@niedermayer.cc
State Accepted
Commit 7aaab127bebb33003105a620736d6cae8c45a6e5
Headers show

Commit Message

Michael Niedermayer Dec. 6, 2018, 12:41 a.m.
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>
---
 libavcodec/clearvideo.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c
index 0e3c772123..ad3012f7b7 100644
--- a/libavcodec/clearvideo.c
+++ b/libavcodec/clearvideo.c
@@ -570,6 +570,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);