RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
(cherry picked from commit ea770eb559)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-09-24 22:52:03 +02:00
parent 030884f6a6
commit 90e449a690
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/shortendec.c
View File

@ -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);
}