diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-10-02 06:04:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-03 19:34:23 +0200 |
| commit | c694fc5759719de577fd0751103e20b6ce902a8f (patch) | |
| tree | 1d9ab187f9e537a1f8360745537afa719b813d5d | |
| parent | c548b0a4c67b99e8728578a68084664d8bd220ac (diff) | |
| download | ffmpeg-c694fc5759719de577fd0751103e20b6ce902a8f.tar.gz | |
avformat/aiffenc: Fix potential memleak upon failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/aiffenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index dd8b8c3d01..0b837cd264 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -235,7 +235,7 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) static int aiff_write_trailer(AVFormatContext *s) { - int ret; + int ret = 0; AVIOContext *pb = s->pb; AIFFOutputContext *aiff = s->priv_data; AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar; @@ -263,7 +263,7 @@ static int aiff_write_trailer(AVFormatContext *s) /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - return ret; + goto free; /* File length */ file_size = avio_tell(pb); @@ -273,9 +273,10 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } +free: ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); - return 0; + return ret; } #define OFFSET(x) offsetof(AIFFOutputContext, x) |