From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/vp9_raw_reorder_bsf: Fix leak of cached packet
Date: Tue, 5 Apr 2022 16:30:41 +0200
Message-ID: <AS8PR01MB79448AA365CA7DB75AB63CFE8FE49@AS8PR01MB7944.eurprd01.prod.exchangelabs.com> (raw)
In-Reply-To: <AS1PR01MB95642EAE3C3E93BBF8ABEB9B8FE19@AS1PR01MB9564.eurprd01.prod.exchangelabs.com>
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
_______________________________________________
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".
prev parent reply other threads:[~2022-04-05 14:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 20:12 Andreas Rheinhardt
2022-03-31 20:14 ` [FFmpeg-devel] [PATCH 2/2] avcodec/vp9_raw_reorder_bsf: Merge close and flush Andreas Rheinhardt
2022-04-05 14:30 ` Andreas Rheinhardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8PR01MB79448AA365CA7DB75AB63CFE8FE49@AS8PR01MB7944.eurprd01.prod.exchangelabs.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git