GeezerVisonThe World Wide Web, restored to 800 pixels of glory. | ||||||||
| Home|About|Gaming cabinet|Archives|How it works|Starter sites | ||||||||
GeezerVison is showing patchwork.ffmpeg.org — [FFmpeg-devel,PR] avfilter: fixing issues found in reviews of the last month (PR #25956) - Patchwork [FFmpeg-devel,PR] avfilter: fixing issues found in reviews of the last month (PR #25956)
Commit Message
Baptiste Coudurier
Nov. 11, 2026, 11:53 p.m. UTC
PR #25956 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25956 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25956.patch >From 81d8208185679c502821b2de9c90429e4a3e519f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <[email protected]> Date: Wed, 11 Nov 2026 23:30:15 +0100 Subject: [PATCH 1/3] avfilter/af_asetnsamples: pad to the sample count the frame was taken with Fixes: out of array write Fixes: Zvv92YsURhPU Found during the triage of a finding from the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25800 Out of array write Replicated through UnModified FFmpeg with ASAN --- libavfilter/af_asetnsamples.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index 137fab94033..fe4e5bda1d0 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -55,22 +55,23 @@ static int activate(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; ASNSContext *s = ctx->priv; AVFrame *frame = NULL, *pad_frame; + const int nb_samples = ctx->is_disabled ? 0 : s->nb_out_samples; int ret; FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - if (ctx->is_disabled) + if (!nb_samples) ret = ff_inlink_consume_frame(inlink, &frame); else - ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame); + ret = ff_inlink_consume_samples(inlink, nb_samples, nb_samples, &frame); if (ret < 0) return ret; if (ret > 0) { - if (!s->pad || ctx->is_disabled || frame->nb_samples == s->nb_out_samples) + if (!s->pad || ctx->is_disabled || frame->nb_samples >= nb_samples) return ff_filter_frame(outlink, frame); - pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples); + pad_frame = ff_get_audio_buffer(outlink, nb_samples); if (!pad_frame) { av_frame_free(&frame); return AVERROR(ENOMEM); @@ -86,7 +87,7 @@ static int activate(AVFilterContext *ctx) av_samples_copy(pad_frame->extended_data, frame->extended_data, 0, 0, frame->nb_samples, frame->ch_layout.nb_channels, frame->format); av_samples_set_silence(pad_frame->extended_data, frame->nb_samples, - s->nb_out_samples - frame->nb_samples, frame->ch_layout.nb_channels, + nb_samples - frame->nb_samples, frame->ch_layout.nb_channels, frame->format); av_frame_free(&frame); return ff_filter_frame(outlink, pad_frame); -- 2.54.0 >From 039589cf9e9d560547c559c230f3ead5689a75af Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <[email protected]> Date: Wed, 11 Nov 2026 23:33:29 +0100 Subject: [PATCH 2/3] avfilter/af_dynaudnorm: apply a new frame length and overlap before taking the next frame Fixes: out of array write Fixes: negative size memset Fixes: FSTVpORbTPVr Regression since: 456d48c752 Found during the triage of a finding from the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25800 Out of array write and negative size memset Replicated through UnModified FFmpeg with ASAN --- libavfilter/af_dynaudnorm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index 98a3bb91e5b..1af6a3ed9f0 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -936,7 +936,7 @@ static int activate(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; DynamicAudioNormalizerContext *s = ctx->priv; AVFrame *in = NULL; - int ret = 0, status; + int ret = 0, status, frame_len; int64_t pts; ret = av_channel_layout_copy(&s->ch_layout, &inlink->ch_layout); @@ -947,6 +947,19 @@ static int activate(AVFilterContext *ctx) FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + frame_len = frame_size(inlink->sample_rate, s->frame_len_msec); + if (frame_len < 0) + return frame_len; + if (frame_len != s->frame_len) { + AVFrame *window = ff_get_audio_buffer(outlink, frame_len * 2); + if (!window) + return AVERROR(ENOMEM); + av_frame_free(&s->window); + s->window = window; + s->frame_len = frame_len; + } + s->sample_advance = FFMAX(1, lrint(s->frame_len * (1. - s->overlap))); + if (!s->eof) { ret = ff_inlink_consume_samples(inlink, s->sample_advance, s->sample_advance, &in); if (ret < 0) @@ -986,9 +999,8 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar char *res, int res_len, int flags) { DynamicAudioNormalizerContext *s = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; int prev_filter_size = s->filter_size; - int frame_len, ret; + int ret; ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); if (ret < 0) @@ -1005,18 +1017,6 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar } } - frame_len = frame_size(inlink->sample_rate, s->frame_len_msec); - if (frame_len < 0) - return frame_len; - if (frame_len != s->frame_len) { - AVFrame *window = ff_get_audio_buffer(ctx->outputs[0], frame_len * 2); - if (!window) - return AVERROR(ENOMEM); - av_frame_free(&s->window); - s->window = window; - s->frame_len = frame_len; - } - s->sample_advance = FFMAX(1, lrint(s->frame_len * (1. - s->overlap))); if (s->expr_str) { ret = av_expr_parse(&s->expr, s->expr_str, var_names, NULL, NULL, NULL, NULL, 0, ctx); -- 2.54.0 >From 54268d9c0d2dc276ba1e7fcfebb99b38823b7ada Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <[email protected]> Date: Wed, 11 Nov 2026 23:33:29 +0100 Subject: [PATCH 3/3] avfilter/af_surround: apply a new overlap before taking the next frame Fixes: negative size memset Fixes: 1qnBq4rDE31l Found during the triage of a finding from the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25800 Negative size memset Replicated through UnModified FFmpeg with ASAN --- libavfilter/af_surround.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 4e23e422ffa..455d5dbe108 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -1353,6 +1353,7 @@ static int activate(AVFilterContext *ctx) FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap)); ret = ff_inlink_consume_samples(inlink, s->hop_size, s->hop_size, &in); if (ret < 0) return ret; @@ -1416,15 +1417,12 @@ static av_cold void uninit(AVFilterContext *ctx) static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) { - AudioSurroundContext *s = ctx->priv; int ret; ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); if (ret < 0) return ret; - s->hop_size = FFMAX(1, s->win_size * (1. - s->overlap)); - allchannels_spread(ctx); set_input_levels(ctx); set_output_levels(ctx); | ||||||||
| You are visitor 01402622 — GeezerVison does not store the pages you look up. Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required. |