diff mbox series

[FFmpeg-devel,1/2] avcodec/vp9_raw_reorder_bsf: Fix leak of cached packet

Message ID AS1PR01MB95642EAE3C3E93BBF8ABEB9B8FE19@AS1PR01MB9564.eurprd01.prod.exchangelabs.com
State Accepted
Commit ebec6079414262fdc6e161b73f4ac38cd6e4a276
Headers show
Series [FFmpeg-devel,1/2] avcodec/vp9_raw_reorder_bsf: Fix leak of cached packet | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt March 31, 2022, 8:12 p.m. UTC 
In case the BSF has not been drained before flushing/closing,
the context's next_frame might be set; yet it is not freed
in flush or close. The former only zeroes it (which automatically
causes a leak in case it was set). So do this when closing
and flushing.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/vp9_raw_reorder_bsf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andreas Rheinhardt April 5, 2022, 2:30 p.m. UTC | #1 
Andreas Rheinhardt:
> In case the BSF has not been drained before flushing/closing,
> the context's next_frame might be set; yet it is not freed
> in flush or close. The former only zeroes it (which automatically
> causes a leak in case it was set). So do this when closing
> and flushing.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/vp9_raw_reorder_bsf.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c
> index e7d301cb85..368dcb26c2 100644
> --- a/libavcodec/vp9_raw_reorder_bsf.c
> +++ b/libavcodec/vp9_raw_reorder_bsf.c
> @@ -396,7 +396,7 @@ static void vp9_raw_reorder_flush(AVBSFContext *bsf)
>  
>      for (int s = 0; s < FRAME_SLOTS; s++)
>          vp9_raw_reorder_clear_slot(ctx, s);
> -    ctx->next_frame = NULL;
> +    vp9_raw_reorder_frame_free(&ctx->next_frame);
>      ctx->sequence = 0;
>  }
>  
> @@ -407,6 +407,7 @@ static void vp9_raw_reorder_close(AVBSFContext *bsf)
>  
>      for (s = 0; s < FRAME_SLOTS; s++)
>          vp9_raw_reorder_clear_slot(ctx, s);
> +    vp9_raw_reorder_frame_free(&ctx->next_frame);
>  }
>  
>  static const enum AVCodecID vp9_raw_reorder_codec_ids[] = {

Will apply this patchset tonight unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c
index e7d301cb85..368dcb26c2 100644
--- a/libavcodec/vp9_raw_reorder_bsf.c
+++ b/libavcodec/vp9_raw_reorder_bsf.c
@@ -396,7 +396,7 @@  static void vp9_raw_reorder_flush(AVBSFContext *bsf)
 
     for (int s = 0; s < FRAME_SLOTS; s++)
         vp9_raw_reorder_clear_slot(ctx, s);
-    ctx->next_frame = NULL;
+    vp9_raw_reorder_frame_free(&ctx->next_frame);
     ctx->sequence = 0;
 }
 
@@ -407,6 +407,7 @@  static void vp9_raw_reorder_close(AVBSFContext *bsf)
 
     for (s = 0; s < FRAME_SLOTS; s++)
         vp9_raw_reorder_clear_slot(ctx, s);
+    vp9_raw_reorder_frame_free(&ctx->next_frame);
 }
 
 static const enum AVCodecID vp9_raw_reorder_codec_ids[] = {