aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-15 21:08:31 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-06-25 13:30:09 +0200
commit930cdef80ab695132d3de2128c3c23f2d698918b (patch)
tree34e0da90e14815f27dbb9e7e83047b9a19142b74
parentce3b0b9066b433564ed3ee3eed3a1e8f2c0834a1 (diff)
downloadffmpeg-930cdef80ab695132d3de2128c3c23f2d698918b.tar.gz
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@niedermayer.cc>
-rw-r--r--libavcodec/motionpixels.c2
1 files changed, 2 insertions, 0 deletions
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;
}