diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-05 12:18:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-27 17:50:47 +0200 |
| commit | ec23fe0fd908e78b0bf23cf2b880dcb7a7c5640a (patch) | |
| tree | 62ceafd0b3ead0b0257605e81fe755a8c0171271 | |
| parent | 837e9e8898f3110cc6328d35ca77eda4fc630820 (diff) | |
| download | ffmpeg-ec23fe0fd908e78b0bf23cf2b880dcb7a7c5640a.tar.gz | |
avcodec/bitstream: Check for integer code truncation in build_table()
Fixes: out of array read
Fixes: 14563/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5646451545210880
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 e78b0f83748f92ea9e93b21c36082e0dd04d7cb1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bitstream.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index ed528fe4af..218412bb9b 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -226,6 +226,10 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, /* note: realloc has been done, so reload tables */ table = (volatile VLC_TYPE (*)[2])&vlc->table[table_index]; table[j][0] = index; //code + if (table[j][0] != index) { + avpriv_request_sample(NULL, "strange codes"); + return AVERROR_PATCHWELCOME; + } i = k-1; } } |