diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-04-25 19:54:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:54:52 +0200 |
| commit | 2b11977c9ed728f50dd70db646472552044aed6e (patch) | |
| tree | 69dc01b33b3c2ba319ff6addd9115ddfed079d7b | |
| parent | dea3933dd57ad14f91f78ded26309b7b39c69aa9 (diff) | |
| download | ffmpeg-2b11977c9ed728f50dd70db646472552044aed6e.tar.gz | |
avformat/msf: Check that channels doesnt overflow during extradata construction
Fixes: signed integer overflow: 2048 * 1122336 cannot be represented in type 'int'
Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MSF_fuzzer-6726959600107520
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 a1a277926b49dad60d9e78c6c7a8c6b5d0d6d7c9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/msf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/msf.c b/libavformat/msf.c index 6bd18f29bd..9b9d43b4c4 100644 --- a/libavformat/msf.c +++ b/libavformat/msf.c @@ -70,6 +70,8 @@ static int msf_read_header(AVFormatContext *s) case 4: case 5: case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->channels; + if (st->codecpar->channels > UINT16_MAX / 2048) + return AVERROR_INVALIDDATA; ret = ff_alloc_extradata(st->codecpar, 14); if (ret < 0) return ret; |