aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-23 19:39:16 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-06 14:41:41 +0200
commit9e2cc2b6ec07fb5c7ff19e6b044f8e7504bab36c (patch)
treecd9243af8f2d66117bd6bb991d76afdcb7eb756f
parent7db392e6f8545f804a6a706f75c02ddcb075e4a9 (diff)
downloadffmpeg-9e2cc2b6ec07fb5c7ff19e6b044f8e7504bab36c.tar.gz
avformat/dsfdec: Change order of operations in bitrate computation
Fixes: signed integer overflow: 538976288 * 67372036 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-6751696819716096 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 5e38eff284637e9f7c3c25d020df549ca6667e40) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/dsfdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c
index 1df163e114..71dbf2f112 100644
--- a/libavformat/dsfdec.c
+++ b/libavformat/dsfdec.c
@@ -129,7 +129,7 @@ static int dsf_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
st->codecpar->block_align *= st->codecpar->channels;
- st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL;
+ st->codecpar->bit_rate = st->codecpar->channels * 8LL * st->codecpar->sample_rate;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
avio_skip(pb, 4);