diff options
| author | Michael Niedermayer <[email protected]> | 2020-11-05 21:22:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-09-10 16:04:26 +0200 |
| commit | a643e2e9c1cb9ab0b33570756399c898a23d8420 (patch) | |
| tree | 0068e0df433cb4a3d24d306574da6d987780d4a1 | |
| parent | fe64c72c5a6b4db6edc13b7575b03ac6f60b5b50 (diff) | |
avformat/dsfdec: Check block_align more completely
Fixes: infinite loop
Fixes: 26865/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-5649473830912000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 65b8974d54455adc7a462f0f7385b76e1d08101c)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/dsfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index afb24634b2..46cc1f74f0 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -124,8 +124,8 @@ static int dsf_read_header(AVFormatContext *s) dsf->audio_size = avio_rl64(pb) / 8 * st->codecpar->channels; st->codecpar->block_align = avio_rl32(pb); - if (st->codecpar->block_align > INT_MAX / st->codecpar->channels) { - avpriv_request_sample(s, "block_align overflow"); + if (st->codecpar->block_align > INT_MAX / st->codecpar->channels || st->codecpar->block_align <= 0) { + avpriv_request_sample(s, "block_align invalid"); return AVERROR_INVALIDDATA; } st->codecpar->block_align *= st->codecpar->channels; |