GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Patchwork
  • Patches
  • Bundles
  • About this project
  • Login
  • Register
  • Mail settings

This view

  • Original page
  • New address

GeezerVison is showing patchwork.ffmpeg.org — [FFmpeg-devel,PR] avfilter: fixing issues found in reviews of the last month (PR #25956) - Patchwork

    diff mbox series

    [FFmpeg-devel,PR] avfilter: fixing issues found in reviews of the last month (PR #25956)

    Message ID [email protected]
    State New
    Headers
    Return-Path: <[email protected]>
    Delivered-To: [email protected]
    Received: from ffbox0-bg.ffmpeg.org
    	by ffbox0-bg.ffmpeg.org with LMTP
    	id cE1oAk8K9WrE/hoA028elg
    	(envelope-from <[email protected]>)
    	for <[email protected]>; Thu, 12 Nov 2026 02:37:35 +0200
    Received: from [172.18.0.4] (unknown [172.18.0.4])
    	by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EEEEA24515D0;
    	Thu, 12 Nov 2026 02:37:34 +0200 (EET)
    DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=mail;
    	t=1794443854; h=from:from:reply-to:reply-to:subject:subject:date:date:
    	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
    	 content-type:content-type:
    	 content-transfer-encoding:content-transfer-encoding:list-id:list-help:
    	 list-owner:list-unsubscribe:list-subscribe:list-post;
    	bh=mMEKe3nck/hRIWmwyRLnGzdbYl9N/JbxYYUNRqNPbaI=;
    	b=FKIwEqpCdSvJx7NMr08hF6DTgR4JvW7iL2e3cP8peaiNljkkxzZ3q/7TnK6N1XhS8DJPOd
    	hTGNdcXYIWwR+Jn618Ogw6ZsMLuXVuu3sGOq/zEJeBxu9g3YfVO9PnpzR+yTLo4LCZdLvw
    	/iWYlKwtKT5FrkSEJ5E26TMkAWqLpvm+D6wEMxPcyNnYXYYnibOAM3n05O7xUkkW5QXqnh
    	yeLFo46zVUUa7ppZrbi1U5qv/k/3Av+RU57OjZ7QKVjlkE8gfbN29sZdD/HH62bEazFj99
    	KVC/MOhjleh9+Zm3dAd1OF6mM9+VR8xd8G93JvO75M21JBF6jtcjBfYqtGMKiQ==
    ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1794443844;
     b=sch3DxoIrMgUV7I9ZQlTMzgStUCieKEx4cWCK7lyOFcyAKro6y335q0AXuhCHZFmckrhG
     +jzB4P0FuvP51TmUKoaPStFxz7aYDHUuuKomGzxLf4Z73tYfKxd/hkhzR8zwX2sJRRgEHUR
     QisWu9FH6U+DuLTTC23+Gc9XE3F4Nw5X261QHlqRaCX+44yVxVSfNrTZVKk/S6M+0Ayelni
     5aLG6DEz3ajWaBYFJxkEMA6waTN9ybT44KhLKgLUqkuaC7m7Pr9lBXgB3A95bO5apX34RbJ
     FKpaySebQ/w1mKAyIBwiYnR194fEsgL0wEigs9ANm2BEcdiqsE/+A6xMj8Rw==
    ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed;
     d=ffmpeg.org; s=arc; t=1794443844; h=from : sender : reply-to :
     subject : date : message-id : to : cc : mime-version : content-type :
     content-transfer-encoding : content-id : content-description :
     resent-date : resent-from : resent-sender : resent-to : resent-cc :
     resent-message-id : in-reply-to : references : list-id : list-help :
     list-unsubscribe : list-subscribe : list-post : list-owner :
     list-archive; bh=tfAwc2EAjRLc8slIkizVZRikaXJ95ePzQsxXRMFIOiw=;
     b=UOdJzHYyok5CQ8vysEBXqRVNzTywnUumRROU3HawaiNIeFgso8Y4DHNlzjaOHhP7y4RjE
     2gAfiVPA7o/5xIZbXEZlAfQn+DPQAcCuBi5Xmt/LuX+rUxlSeXP9LefNFGRBkOO43lH93Ef
     dhtD3RE0IeTn0WRulm01/MpP5BwYaAyu6fzMmz5PZuglYTw2RgvrEnwTYV5kuXTvWmPeqUH
     9YIO/A63i+9RBeG1OXtrippeFE2Egw9C0lU+bCZsKI3rAc0VVm2Ywle1UvKs7UHUeN72V+T
     K3FvFPNfXjMQwMK7+it6+PQh1upoQBObKI4BttQdGy2ximLwLtsPSXVjFVDQ==
    ARC-Authentication-Results: i=1; ffmpeg.org;
     dkim=pass header.d=ffmpeg.org;
     arc=none;
     dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine
    Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org;
     arc=none (Message is not ARC signed);
     dmarc=pass (Used From Domain Record) header.from=ffmpeg.org
     policy.dmarc=quarantine
    DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=mail;
    	t=1794441213; h=from:from:reply-to:reply-to:subject:subject:date:date:
    	 message-id:message-id:to:to:cc:mime-version:mime-version:
    	 content-type:content-type:
      content-transfer-encoding:content-transfer-encoding;
    	bh=LffGreuK9UFnDKPnCocI55w1A5uTUTBaZuJTrbRu1T4=;
    	b=mGTk5VjRuDcJPlW1jYcAhq4glBP687Hddav8aVEMyzmwbWXZ/+o/Io332/uJvX0Ap4rvvI
    	vYkVGjKpQTf+5FWs72RzWUToskLxz8qcDLDt+paIcjFnw92LUEz0sG7N21nzp0U9eu78rL
    	psw9XRM8ljOxxNt8RXzvjbcL602+ZetKEo07xQwyyq60uasMEDt0sN8syqoQ32ALUkULh+
    	Cq9KAbL8BftIBEa6cslenuOpk//+JkHgvYEOuP+6b32IFLYrlJI92yVQa5x5F8vac4fLar
    	KsGfE9tNZNvlmpI3uIDldNy+Z4YJ7s/vBjyw50rVcvPpaq54pKuF6XMjiLMH4Q==
    MIME-Version: 1.0
    To: [email protected]
    Date: Wed, 11 Nov 2026 23:53:33 -0000
    Message-Id: <[email protected]>
    Message-ID-Hash: AAPZSJIYW63HAHGD4W5IYOTF6YJAZKRZ
    X-Message-ID-Hash: AAPZSJIYW63HAHGD4W5IYOTF6YJAZKRZ
    X-MailFrom: [email protected]
    X-Mailman-Rule-Hits: nonmember-moderation
    X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop;
     banned-address; header-match-ffmpeg-devel.ffmpeg.org-0;
     header-match-ffmpeg-devel.ffmpeg.org-1;
     header-match-ffmpeg-devel.ffmpeg.org-2;
     header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation
    X-Mailman-Version: 3.3.10
    Precedence: list
    Reply-To: FFmpeg development discussions and patches <[email protected]>
    Subject: [FFmpeg-devel] [PR] avfilter: fixing issues found in reviews of the
     last month
     (PR #25956)
    List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
    Archived-At: 
     <https://lists.ffmpeg.org/archives/list/[email protected]/message/AAPZSJIYW63HAHGD4W5IYOTF6YJAZKRZ/>
    Archived-At: 
     <https://lists.ffmpeg.org/lore/ffmpeg-devel/[email protected]/>
    List-Archive: 
     <https://lists.ffmpeg.org/archives/list/[email protected]/>
    List-Archive: <https://lists.ffmpeg.org/lore/ffmpeg-devel/>
    List-Help: <mailto:[email protected]?subject=help>
    List-Owner: <mailto:[email protected]>
    List-Post: <mailto:[email protected]>
    List-Subscribe: <mailto:[email protected]>
    List-Unsubscribe: <mailto:[email protected]>
    From: michaelni via ffmpeg-devel <[email protected]>
    Cc: michaelni <[email protected]>
    Content-Type: text/plain; charset="us-ascii"
    Content-Transfer-Encoding: 7bit
    X-getmail-retrieved-from-mailbox: INBOX
    Series [FFmpeg-devel,PR] avfilter: fixing issues found in reviews of the last month (PR #25956) |
    • [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 mbox series

    Patch

    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.