diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-17 22:40:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-10-09 22:15:50 +0200 |
| commit | 167c0dcfdcb7b55a85ae6aa04ae1636622d798b3 (patch) | |
| tree | 021849b76d694938e79e331c2f1aa4c3be4847a5 | |
| parent | 9fb728dd1c3bc2114d1153a8b61f38b1980747f2 (diff) | |
| download | ffmpeg-167c0dcfdcb7b55a85ae6aa04ae1636622d798b3.tar.gz | |
avformat/dxa: avoid bpc overflows
Fixes: signed integer overflow: 2147483647 + 32 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-6639823726706688
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 93db0f0740cacd64ae07b5e8606b70021e48d364)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/dxa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/dxa.c b/libavformat/dxa.c index a616f8f74b..0d820c7413 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -118,9 +118,12 @@ static int dxa_read_header(AVFormatContext *s) if(tag == MKTAG('d', 'a', 't', 'a')) break; avio_skip(pb, fsize); } - c->bpc = (fsize + c->frames - 1) / c->frames; - if(ast->codecpar->block_align) + c->bpc = (fsize + (int64_t)c->frames - 1) / c->frames; + if(ast->codecpar->block_align) { + if (c->bpc > INT_MAX - ast->codecpar->block_align + 1) + return AVERROR_INVALIDDATA; c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align; + } c->bytes_left = fsize; c->wavpos = avio_tell(pb); avio_seek(pb, c->vidpos, SEEK_SET); |