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

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Tue Apr 5 17:30:41 EEST 2022


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 at 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


More information about the ffmpeg-devel mailing list