[FFmpeg-cvslog] avcodec/motionpixels: Check for vlc error in mp_get_vlc()

Michael Niedermayer git at videolan.org
Thu Jun 27 20:49:34 EEST 2019


ffmpeg | branch: release/4.1 | Michael Niedermayer <michael at niedermayer.cc> | Sat Jun 15 21:08:31 2019 +0200| [da081ecf69f4c46c6638abb28b0acac33c2be075] | committer: Michael Niedermayer

avcodec/motionpixels: Check for vlc error in mp_get_vlc()

Fixes: 15246/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOTIONPIXELS_fuzzer-5168534407086080
Fixes: runtime error: index -1 out of bounds for type 'HuffCode [16]'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 930cdef80ab695132d3de2128c3c23f2d698918b)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index a88b837b3e..73977664a5 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -201,6 +201,8 @@ static int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb)
     int i;
 
     i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1);
+    if (i < 0)
+        return i;
     return mp->codes[i].delta;
 }
 



More information about the ffmpeg-cvslog mailing list