diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-17 23:46:35 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-24 23:58:20 +0300 |
| commit | 4038dfc1d13728f4c7cb6bc9eb44a03279aec7f4 (patch) | |
| tree | baf65fba9af4cb4acd8c74734aa33c6fc1eb8614 | |
| parent | c38fde3b9d4a3f1b1ff56bf1b5feb7a245f7192b (diff) | |
avformat/genh: Check nb_channels for IMA ADPCM
The check could be made more strict
Fixes: signed integer overflow: 36 * 538976288 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_GENH_fuzzer-6539389873815552
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 0345a885455dea52fcc570b97f5dc5c75372a39c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/genh.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/genh.c b/libavformat/genh.c index a25d4d625a..1f707b5555 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -78,6 +78,8 @@ static int genh_read_header(AVFormatContext *s) case 0: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; break; case 1: case 11: st->codecpar->bits_per_coded_sample = 4; + if (st->codecpar->ch_layout.nb_channels > INT_MAX / 36) + return AVERROR_INVALIDDATA; st->codecpar->block_align = 36 * st->codecpar->ch_layout.nb_channels; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_WAV; break; case 2: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_DTK; break; |