File ffmpeg-CVE-2021-38291.patch of Package ffmpeg
diff -Nura ffmpeg-3.4.2/libavcodec/utils.c ffmpeg-3.4.2_new/libavcodec/utils.c
--- ffmpeg-3.4.2/libavcodec/utils.c 2024-08-08 18:46:56.332667319 +0800
+++ ffmpeg-3.4.2_new/libavcodec/utils.c 2024-08-08 18:49:51.952582498 +0800
@@ -1866,20 +1866,22 @@
int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
{
- return get_audio_frame_duration(avctx->codec_id, avctx->sample_rate,
+ int duration = get_audio_frame_duration(avctx->codec_id, avctx->sample_rate,
avctx->channels, avctx->block_align,
avctx->codec_tag, avctx->bits_per_coded_sample,
avctx->bit_rate, avctx->extradata, avctx->frame_size,
frame_bytes);
+ return FFMAX(0, duration);
}
int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes)
{
- return get_audio_frame_duration(par->codec_id, par->sample_rate,
+ int duration = get_audio_frame_duration(par->codec_id, par->sample_rate,
par->channels, par->block_align,
par->codec_tag, par->bits_per_coded_sample,
par->bit_rate, par->extradata, par->frame_size,
frame_bytes);
+ return FFMAX(0, duration);
}
#if !HAVE_THREADS