[FFmpeg-cvslog] avcodec/vp3: Check for end of input in vp4_unpack_vlcs()

Michael Niedermayer git at videolan.org
Sun Aug 4 22:19:12 EEST 2019


ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Fri Aug  2 21:23:18 2019 +0200| [44119e5ad6ca560ca6a1d35d250ad06604467145] | committer: Michael Niedermayer

avcodec/vp3: Check for end of input in vp4_unpack_vlcs()

Fixes: Timeout (too long -> 1sec)
Fixes: 15232/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-5769583086010368

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 58c7f419ce757c3c741d6071e0dafcba7d875567)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44119e5ad6ca560ca6a1d35d250ad06604467145
---

 libavcodec/vp3.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 6ce901eda9..28ed0461c7 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1403,6 +1403,8 @@ static int vp4_unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
     int eob_run;
 
     while (!eob_tracker[coeff_i]) {
+        if (get_bits_left(gb) < 1)
+            return AVERROR_INVALIDDATA;
 
         token = get_vlc2(gb, vlc_tables[coeff_i]->table, 11, 3);
 



More information about the ffmpeg-cvslog mailing list