[FFmpeg-cvslog] avformat/dxa: avoid bpc overflows
Michael Niedermayer
git at videolan.org
Mon Sep 26 18:14:43 EEST 2022
ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Sat Sep 17 22:40:47 2022 +0200| [78ed283608071dfc7e5a4ff00d6eaaaf2c1d329b] | committer: Michael Niedermayer
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 at niedermayer.cc>
(cherry picked from commit 93db0f0740cacd64ae07b5e8606b70021e48d364)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78ed283608071dfc7e5a4ff00d6eaaaf2c1d329b
---
libavformat/dxa.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index cd9c489851..2a5487710f 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);
More information about the ffmpeg-cvslog
mailing list