From e30b61c261dedf318a2e68c9268409fb94362e36 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 20 Nov 2020 17:36:39 +0100 Subject: [PATCH] avformat/flacenc: Fix memleak when writing attached pictures fails The FLAC muxer currently stores an attached picture corresponding to an AVStream in AVStream.priv_data. The AVPacket contained therein is unreferenced after it has been written. The AVPacket structure itself is then freed generically as AVStream.priv_data. And this can lead to memleaks if an attached picture is not written: It might be because the trailer is never written or because writing a previous attached picture failed in case error_recognition is set to explode. Therefore free the packets properly (i.e. with av_packet_free()) in the muxer's deinit function. Signed-off-by: Andreas Rheinhardt (cherry picked from commit 029cf6a91ceb849f31f575111070a113c53b29ee) --- libavformat/flacenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index b947a3b067..da0338dcb1 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -346,6 +346,8 @@ static void flac_deinit(struct AVFormatContext *s) FlacMuxerContext *c = s->priv_data; ff_packet_list_free(&c->queue, &c->queue_end); + for (unsigned i = 0; i < s->nb_streams; i++) + av_packet_free((AVPacket **)&s->streams[i]->priv_data); } static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)