aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-17 22:40:47 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-09-24 22:58:20 +0200
commitc38fde3b9d4a3f1b1ff56bf1b5feb7a245f7192b (patch)
tree62d46333462ddeb71cabc69cb712f83a6b06e3a1
parent48acb06c7830a44a641e545b8eb079b47987ac62 (diff)
downloadffmpeg-c38fde3b9d4a3f1b1ff56bf1b5feb7a245f7192b.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.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 16fbb08156..474b85270a 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);