[FFmpeg-cvslog] avdevice/pulse_audio_enc: Use av_rescale() to avoid integer overflow
Michael Niedermayer
git at videolan.org
Thu Jun 13 23:41:33 EEST 2024
ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Thu May 23 01:25:50 2024 +0200| [b7efe0f704898c426aa73c8bfa6d61b0bec2d8cd] | committer: Michael Niedermayer
avdevice/pulse_audio_enc: Use av_rescale() to avoid integer overflow
Fixes: CID1503075 Unintentional integer overflow
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6f52b64bcc345842a88a40ddf3873559f1160e34)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7efe0f704898c426aa73c8bfa6d61b0bec2d8cd
---
libavdevice/pulse_audio_enc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index d5928e2b3f..dd52ea94aa 100644
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -470,10 +470,11 @@ static av_cold int pulse_write_header(AVFormatContext *h)
s->nonblocking = (h->flags & AVFMT_FLAG_NONBLOCK);
if (s->buffer_duration) {
- int64_t bytes = s->buffer_duration;
- bytes *= st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate *
- av_get_bytes_per_sample(st->codecpar->format);
- bytes /= 1000;
+ int64_t bytes = av_rescale(s->buffer_duration,
+ st->codecpar->ch_layout.nb_channels *
+ (int64_t)st->codecpar->sample_rate *
+ av_get_bytes_per_sample(st->codecpar->format),
+ 1000);
buffer_attributes.tlength = FFMAX(s->buffer_size, av_clip64(bytes, 0, UINT32_MAX - 1));
av_log(s, AV_LOG_DEBUG,
"Buffer duration: %ums recalculated into %"PRId64" bytes buffer.\n",
More information about the ffmpeg-cvslog
mailing list