Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'

[ffmpeg] / libavcodec / hq_hqa.c

diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index f88ad7d5f5a32a2e06ffe8784c7670936b2f238f..ec9da3e04fdad66f9e4743783ce2f3e2f248e0c2 100644 (file)
--- 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++)