diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-31 13:51:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-11 21:23:48 +0200 |
| commit | 1703863faa7dca619d761c0145e1b226a5e89a00 (patch) | |
| tree | a85b76525efba5bc77b728d487b773c1afcb58da | |
| parent | 3dc3b959103bac2965fb5ca036bb6b7485558697 (diff) | |
| download | ffmpeg-1703863faa7dca619d761c0145e1b226a5e89a00.tar.gz | |
avformat/bintext: Check width
Fixes: division by 0
Fixes: 26780/clusterfuzz-testcase-minimized-ffmpeg_dem_ADF_fuzzer-5117945027756032
Fixes: 26998/clusterfuzz-testcase-minimized-ffmpeg_dem_ADF_fuzzer-5119352359354368
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 f6dc285fb5f30406b275b968ee438a738da799d1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/bintext.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/bintext.c b/libavformat/bintext.c index defc39c9be..c827a35e5f 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -242,6 +242,8 @@ static int adf_read_header(AVFormatContext *s) bin->fsize = avio_size(pb) - 1 - 192 - 4096; st->codecpar->width = 80<<3; ff_sauce_read(s, &bin->fsize, &got_width, 0); + if (st->codecpar->width < 8) + return AVERROR_INVALIDDATA; if (!bin->width) calculate_height(st->codecpar, bin->fsize); avio_seek(pb, 1 + 192 + 4096, SEEK_SET); |