From 1004a92cd44404ad55a75509cd289a70fa03d333 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 11 Apr 2020 11:45:32 +0200 Subject: [PATCH] avformat/mux: Fix leaks on error when writing noninterleaved uncoded frames If writing uncoded frames in noninterleaved mode fails at the preparatory steps (i.e. before it reaches write_packet()), the packet would not be unreferenced and the frame would leak. This is fixed by unreferencing the packet in write_uncoded_frame_internal() instead. This also makes it possible to remove the unreferencing in write_packet() itself: In noninterleaved mode frames are now freed in write_uncoded_frame_internal(), while they are freed in interleaved mode when their containing packet gets unreferenced (like normal packets). Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index bb54fd5528..67326292be 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -743,7 +743,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) AVFrame **frame = (AVFrame **)pkt->data; av_assert0(pkt->size == sizeof(*frame)); ret = s->oformat->write_uncoded_frame(s, pkt->stream_index, frame, 0); - av_packet_unref(pkt); } else { ret = s->oformat->write_packet(s, pkt); } @@ -1318,6 +1317,7 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, AVFrame *frame, int interleaved) { AVPacket pkt, *pktp; + int ret; av_assert0(s->oformat); if (!s->oformat->write_uncoded_frame) { @@ -1354,8 +1354,11 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, pkt.flags |= AV_PKT_FLAG_UNCODED_FRAME; } - return interleaved ? av_interleaved_write_frame(s, pktp) : - av_write_frame(s, pktp); + ret = interleaved ? av_interleaved_write_frame(s, pktp) : + av_write_frame(s, pktp); + if (pktp) + av_packet_unref(pktp); + return ret; } int av_write_uncoded_frame(AVFormatContext *s, int stream_index,