diff mbox series

[FFmpeg-devel] avfilter/framesync: fix OOM case

Message ID CAPYw7P4se=z9HDqxivjWC-5-Fpp1GRq+3rxDCGz3NAtb4X2b_g@mail.gmail.com
State New
Headers show
Series [FFmpeg-devel] avfilter/framesync: fix OOM case | expand

Checks

Context Check Description
andriy/configure_x86 warning Failed to run configure

Commit Message

Paul B Mahol Nov. 27, 2023, 12:07 p.m. UTC 
Attached.

Comments

Nicolas George Nov. 28, 2023, 12:32 p.m. UTC | #1 
Paul B Mahol (12023-11-28):
> Gonna apply soon.

24 hours is not enough.
Paul B Mahol Nov. 28, 2023, 12:34 p.m. UTC | #2 
Gonna apply soon.
Paul B Mahol Nov. 28, 2023, 1:04 p.m. UTC | #3 
On Tue, Nov 28, 2023 at 1:32 PM Nicolas George <george@nsup.org> wrote:

> Paul B Mahol (12023-11-28):
> > Gonna apply soon.
>
> 24 hours is not enough.
>

How many hours is enough?


>
> --
>   Nicolas George
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
Paul B Mahol Nov. 28, 2023, 3:52 p.m. UTC | #4 
Will wait max 24 hours.
Nicolas George Nov. 28, 2023, 4:01 p.m. UTC | #5 
Paul B Mahol (12023-11-28):
> Will wait max 24 hours.

You will wait until I post a review, and if you think I am taking too
much time in… let us say… ten days you can politely ask me where I am.
Paul B Mahol Nov. 28, 2023, 4:41 p.m. UTC | #6 
On Tue, Nov 28, 2023 at 5:01 PM Nicolas George <george@nsup.org> wrote:

> Paul B Mahol (12023-11-28):
> > Will wait max 24 hours.
>
> You will wait until I post a review, and if you think I am taking too
> much time in… let us say… ten days you can politely ask me where I am.
>

Once you became one, true, FFmpeg leader and benevolent dictator I may
consider to wait more than 24 hours.
But not for you, Nicolas, you have less than 24 hours to review this patch.


>
> --
>   Nicolas George
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
Nicolas George Nov. 29, 2023, 5:50 p.m. UTC | #7 
Paul B Mahol (12023-11-27):
> Attached.

> From 8ce6bd0090666ef94b0455b7f8f4d3c05e273093 Mon Sep 17 00:00:00 2001
> From: Paul B Mahol <onemda@gmail.com>
> Date: Mon, 27 Nov 2023 13:04:16 +0100
> Subject: [PATCH] avfilter/framesync: fix OOM case
> 
> Fixes OOM when caller keeps adding frames into filtergraph
> that reached EOF by other means, for example EOF is signalled
> by other filter in filtergraph or by buffersink.
> 
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavfilter/framesync.c | 3 +++
>  1 file changed, 3 insertions(+)

LGTM, good catch.
diff mbox series

Patch

From 8ce6bd0090666ef94b0455b7f8f4d3c05e273093 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 27 Nov 2023 13:04:16 +0100
Subject: [PATCH] avfilter/framesync: fix OOM case

Fixes OOM when caller keeps adding frames into filtergraph
that reached EOF by other means, for example EOF is signalled
by other filter in filtergraph or by buffersink.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/framesync.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index 6cb4b21fed..23681b5183 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -354,8 +354,11 @@  static int consume_from_fifos(FFFrameSync *fs)
 
 int ff_framesync_activate(FFFrameSync *fs)
 {
+    AVFilterContext *ctx = fs->parent;
     int ret;
 
+    FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx);
+
     ret = framesync_advance(fs);
     if (ret < 0)
         return ret;
-- 
2.42.1