diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-11 13:37:24 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-18 00:22:22 +0200 |
| commit | a43120b609db300a4b3fa086d6ac753c13e6bf6d (patch) | |
| tree | 1d8d2656f972e0966cf6bfb20ef62a9d1876129f /libavformat/audiointerleave.c | |
| parent | 1004a92cd44404ad55a75509cd289a70fa03d333 (diff) | |
avformat/mux: Fix leak when adding packet to interleavement queue fails
When an error happened in ff_interleave_add_packet() when adding
a packet to the packet queue, said packet would not be unreferenced
in ff_interleave_add_packet(), but would be zeroed in
av_interleaved_write_frame(), which results in a memleak.
This has been fixed: ff_interleave_add_packet() now always unreferences
the input packet on error; as a result, it always returns blank packets
which has been documented. Relying on this a call to av_packet_unref()
in ff_audio_rechunk_interleave() can be removed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/audiointerleave.c')
| -rw-r--r-- | libavformat/audiointerleave.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index f10c83d7c9..36a3288242 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -136,10 +136,8 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { AVPacket new_pkt; while ((ret = interleave_new_audio_packet(s, &new_pkt, i, flush)) > 0) { - if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) { - av_packet_unref(&new_pkt); + if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) return ret; - } } if (ret < 0) return ret; |