Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-01-15 00:08:25 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-10 17:04:26 +0300
commit174093afd1739884e74fd81508b34c5cd2863b97 (patch)
tree786b26f1df21dc38aa4418123b7673d25e7239d4 /libavformat/lxfdec.c
parent97c89068e9d5fbe1b892e0e4efbf0dad0cbbaaa3 (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 <michael@niedermayer.cc> (cherry picked from commit 7819412f4468514a2bab924291d79806a569388c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/lxfdec.c')
-rw-r--r--libavformat/lxfdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 434518fc59..c3bd5107da 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;