diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-24 22:52:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-16 19:17:57 +0200 |
| commit | ea770eb55941a6ed7b86828d6ea2f4e718a4b337 (patch) | |
| tree | 0bf0b923cd46f46b86549d126cd792dad6db9c4d /libavformat/shortendec.c | |
| parent | cf7f35ace58ea80e17f23a7db9ebe50f2158b39a (diff) | |
| download | ffmpeg-ea770eb55941a6ed7b86828d6ea2f4e718a4b337.tar.gz | |
avformat/shortendec: Check k in probe
Fixes: Assertion failure
Fixes: 17640/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5708767475269632
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/shortendec.c')
| -rw-r--r-- | libavformat/shortendec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/shortendec.c b/libavformat/shortendec.c index a2879dc5a3..f7390b2e62 100644 --- a/libavformat/shortendec.c +++ b/libavformat/shortendec.c @@ -40,12 +40,18 @@ static int shn_probe(const AVProbeData *p) channels = get_ur_golomb_shorten(&gb, 0); blocksize = 256; } else { - int k; + unsigned k; k = get_ur_golomb_shorten(&gb, 2); + if (k > 31) + return 0; internal_ftype = get_ur_golomb_shorten(&gb, k); k = get_ur_golomb_shorten(&gb, 2); + if (k > 31) + return 0; channels = get_ur_golomb_shorten(&gb, k); k = get_ur_golomb_shorten(&gb, 2); + if (k > 31) + return 0; blocksize = get_ur_golomb_shorten(&gb, k); } |