diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-04 08:32:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:45 +0100 |
| commit | 5d353f32c69cdbcd7d460a2e1937688a6cead998 (patch) | |
| tree | 9a3d925daba38b5221edae50f8a365dc9ad88cf7 /libavcodec | |
| parent | bf3520cd641d11f133c52f192ce7ec84119a685a (diff) | |
| download | ffmpeg-5d353f32c69cdbcd7d460a2e1937688a6cead998.tar.gz | |
avcodec/vc1_block: Check get_vlc2() return before use
Fixes: index -1 out of bounds for type 'const uint8_t [185][2]'
Fixes: 15720/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSS2_fuzzer-5666071933091840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2cb1f797350875ec45cb20d59dc0684fcbac20fc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1_block.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 9fe12a40ff..05ffed45f2 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -507,6 +507,8 @@ static int vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int escape = decode210(gb); if (escape != 2) { index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3); + if (index < 0) + return AVERROR_INVALIDDATA; run = vc1_index_decode_table[codingset][index][0]; level = vc1_index_decode_table[codingset][index][1]; lst = index >= vc1_last_decode_table[codingset]; |