diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-10-23 14:59:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-24 19:45:17 +0200 |
| commit | 3d5d0301c3d8b0c550db78730e9cfc017d6db5fb (patch) | |
| tree | bbe26f755fe4e1057b8282c063eb31013d3e6c84 | |
| parent | f53525d248634b6a68f37baefc5028d364ba0bff (diff) | |
| download | ffmpeg-3d5d0301c3d8b0c550db78730e9cfc017d6db5fb.tar.gz | |
avformat/icoenc: Add deinit function
Prevents memleaks in situations where the trailer isn't written, e.g.
because of errors during writing the header.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/icoenc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c index e641f7bdc7..975c3466bf 100644 --- a/libavformat/icoenc.c +++ b/libavformat/icoenc.c @@ -183,11 +183,16 @@ static int ico_write_trailer(AVFormatContext *s) avio_wl32(pb, ico->images[i].offset); } - av_freep(&ico->images); - return 0; } +static void ico_deinit(AVFormatContext *s) +{ + IcoMuxContext *ico = s->priv_data; + + av_freep(&ico->images); +} + AVOutputFormat ff_ico_muxer = { .name = "ico", .long_name = NULL_IF_CONFIG_SMALL("Microsoft Windows ICO"), @@ -199,5 +204,6 @@ AVOutputFormat ff_ico_muxer = { .write_header = ico_write_header, .write_packet = ico_write_packet, .write_trailer = ico_write_trailer, + .deinit = ico_deinit, .flags = AVFMT_NOTIMESTAMPS, }; |