Commit ea770eb5 authored by Michael Niedermayer's avatar Michael Niedermayer

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/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent cf7f35ac
...@@ -40,12 +40,18 @@ static int shn_probe(const AVProbeData *p) ...@@ -40,12 +40,18 @@ static int shn_probe(const AVProbeData *p)
channels = get_ur_golomb_shorten(&gb, 0); channels = get_ur_golomb_shorten(&gb, 0);
blocksize = 256; blocksize = 256;
} else { } else {
int k; unsigned k;
k = get_ur_golomb_shorten(&gb, 2); k = get_ur_golomb_shorten(&gb, 2);
if (k > 31)
return 0;
internal_ftype = get_ur_golomb_shorten(&gb, k); internal_ftype = get_ur_golomb_shorten(&gb, k);
k = get_ur_golomb_shorten(&gb, 2); k = get_ur_golomb_shorten(&gb, 2);
if (k > 31)
return 0;
channels = get_ur_golomb_shorten(&gb, k); channels = get_ur_golomb_shorten(&gb, k);
k = get_ur_golomb_shorten(&gb, 2); k = get_ur_golomb_shorten(&gb, 2);
if (k > 31)
return 0;
blocksize = get_ur_golomb_shorten(&gb, k); blocksize = get_ur_golomb_shorten(&gb, k);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment