virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/mux: Fix leaks on error when writing noninterleaved uncoded frames

Browse Source 
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 <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-04-11 11:45:32 +02:00
parent ad1dc918a0
commit 1004a92cd4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mux.c
View File

@ -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,