From 0ed170ec0b7483568ad82c936afee7803a533908 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 18 Jan 2016 11:46:28 +0100
Subject: sub: fix memory leaks

demux_lavf.c leaked the complete subtitle data if it was put through
iconv.

lavc_conv.c leaked AVCodecContext.subtitle_header (set by libavcodec),
which is fixed by using avcodec_free_context(). It also leaked the
subtitle that was decoded last.
---
 demux/demux_lavf.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'demux')

diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 1b3105170d..8cd525b685 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -282,6 +282,8 @@ static void convert_charset(struct demuxer *demuxer)
     // libavformat transparently converts UTF-16 to UTF-8
     if (!mp_charset_is_utf16(cp) && !mp_charset_is_utf8(cp)) {
         bstr conv = mp_iconv_to_utf8(demuxer->log, data, cp, MP_ICONV_VERBOSE);
+        if (conv.start && conv.start != data.start)
+            talloc_steal(alloc, conv.start);
         if (conv.start)
             data = conv;
     }
-- 
cgit v1.2.3