Commit 5fd305b8f4 for ffmpeg
commit 5fd305b8f4214765500f6f6c50a52cf950cb049d
Author: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed Oct 7 16:01:50 2026 +0000
avfilter/firequalizer: avoid overflow selecting RDFT length
The nsamples_max doubling can overflow int for an accepted delay, causing an undersized RDFT and an out-of-bounds write during kernel generation. Compare in int64_t so excessive delays take the existing error path.
Add a FATE check for the reported delay.
Fixes: #24344
Reported-by: yijan4845
Assisted-by: Fairy
diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c
index 63ac308365..809741218d 100644
--- a/libavfilter/af_firequalizer.c
+++ b/libavfilter/af_firequalizer.c
@@ -747,7 +747,7 @@ static int config_input(AVFilterLink *inlink)
for (rdft_bits = RDFT_BITS_MIN; rdft_bits <= RDFT_BITS_MAX; rdft_bits++) {
s->rdft_len = 1 << rdft_bits;
s->nsamples_max = s->rdft_len - s->fir_len + 1;
- if (s->nsamples_max * 2 >= s->fir_len)
+ if ((int64_t)s->nsamples_max * 2 >= s->fir_len)
break;
}
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index b5c27daf1c..f1035bba24 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@ -147,6 +147,12 @@ fate-filter-firequalizer: CMP = oneoff
fate-filter-firequalizer: CMP_UNIT = s16
fate-filter-firequalizer: SIZE_TOLERANCE = 1058400 - 1097208
+# The FIR length fits in int, but no supported RDFT length can contain it.
+FATE_AFILTER-$(call ALLYES, LAVFI_INDEV SINE_FILTER FIREQUALIZER_FILTER ARESAMPLE_FILTER PCM_S16$(if $(filter yes,$(HAVE_BIGENDIAN)),BE,LE)_DECODER PCM_S16LE_ENCODER NULL_MUXER) += fate-filter-firequalizer-large-delay
+fate-filter-firequalizer-large-delay: CMD = ! run $(FFMPEG) -nostdin -hide_banner -f lavfi -i "sine=sample_rate=48000" -af "firequalizer=delay=12500" -c:a pcm_s16le -t 0.1 -f null -
+fate-filter-firequalizer-large-delay: CMP = grep
+fate-filter-firequalizer-large-delay: REF = too large delay, please decrease it.
+
FATE_AFILTER-$(call FILTERDEMDECENCMUX, PAN, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-pan-mono1
fate-filter-pan-mono1: tests/data/asynth-44100-2.wav
fate-filter-pan-mono1: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav