diff mbox

[FFmpeg-devel,3/3] avcodec/hq_hqa: Check remaining input bits in hqa_decode_mb()

Message ID 20180820212901.15317-3-michael@niedermayer.cc
State Accepted
Commit c9222b972d6cbdaf6571cf7ae0a6513bffa5ff9f
Headers show

Commit Message

Michael Niedermayer Aug. 20, 2018, 9:29 p.m. UTC 
Fixes: Timeout
Fixes: 9634/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQ_HQA_fuzzer-6267852259590144

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/hq_hqa.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index f88ad7d5f5..ec9da3e04f 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -181,6 +181,9 @@  static int hqa_decode_mb(HQContext *c, AVFrame *pic, int qgroup,
     int flag = 0;
     int i, ret, cbp;
 
+    if (get_bits_left(gb) < 1)
+        return AVERROR_INVALIDDATA;
+
     cbp = get_vlc2(gb, c->hqa_cbp_vlc.table, 5, 1);
 
     for (i = 0; i < 12; i++)