From 50b4dbf65a8b0fbd0155e1ffc0ed58fa591d3736 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sun, 5 Aug 2012 08:57:20 -0700 Subject: ass subtitles: Fix valgrind warnings. We're now running some of this code through valgrind for the first time, and a few warnings showed up stemming from two problems. 1) The ASS code assumes the subtitle header is null terminated, but it wasn't, and passing the size down doesn't look like fun, so I added a terminator 2) The code wasn't freeing all of its state. Signed-off-by: Philip Langdale --- ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 6098422375..faeb2f5c3a 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3366,7 +3366,8 @@ static int transcode_init(void) if ((ist = get_input_stream(ost))) dec = ist->st->codec; if (dec && dec->subtitle_header) { - ost->st->codec->subtitle_header = av_malloc(dec->subtitle_header_size); + /* ASS code assumes this buffer is null terminated so add extra byte. */ + ost->st->codec->subtitle_header = av_mallocz(dec->subtitle_header_size + 1); if (!ost->st->codec->subtitle_header) { ret = AVERROR(ENOMEM); goto dump_format; -- cgit v1.2.3