diff options
| author | Michael Niedermayer <[email protected]> | 2021-01-14 22:08:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-09-11 21:23:49 +0200 |
| commit | e4f149a26f8f47274a7cfccef892cf09d4a7b6d8 (patch) | |
| tree | 19025c37264f2c49ba742c77a29a55d4a4f529f9 | |
| parent | af1a0cedb22c287cdc79f230082d9fec87a9823a (diff) | |
avformat/lxfdec: Fix multiple integer overflows related to track_size
Fixes: signed integer overflow: 538976288 * 8 cannot be represented in type 'int'
Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_LXF_fuzzer-6634030636335104
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 7819412f4468514a2bab924291d79806a569388c)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/lxfdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 9b3eb6a650..b544966f5a 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -195,7 +195,7 @@ static int get_packet_header(AVFormatContext *s) return AVERROR_PATCHWELCOME; } - samples = track_size * 8 / st->codecpar->bits_per_coded_sample; + samples = track_size * 8LL / st->codecpar->bits_per_coded_sample; //use audio packet size to determine video standard //for NTSC we have one 8008-sample audio frame per five video frames @@ -210,6 +210,8 @@ static int get_packet_header(AVFormatContext *s) avpriv_set_pts_info(s->streams[0], 64, 1, 25); } + if (av_popcount(channels) * (uint64_t)track_size > INT_MAX) + return AVERROR_INVALIDDATA; //TODO: warning if track mask != (1 << channels) - 1? ret = av_popcount(channels) * track_size; |