[FFmpeg-cvslog] matroskaenc: fix memory leak

Mans Rullgard git at videolan.org
Thu May 5 03:30:45 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed May  4 17:57:37 2011 +0100| [eddd580b743692bc930692cb0c5a3e930ab45ad4] | committer: Mans Rullgard

matroskaenc: fix memory leak

This fixes a memory leak occurring when no cue points are defined
since commit 91819763.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eddd580b743692bc930692cb0c5a3e930ab45ad4
---

 libavformat/matroskaenc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index c0427f9..781121a 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -403,8 +403,6 @@ static int64_t mkv_write_cues(AVIOContext *pb, mkv_cues *cues, int num_tracks)
     }
     end_ebml_master(pb, cues_element);
 
-    av_free(cues->entries);
-    av_free(cues);
     return currentpos;
 }
 
@@ -1160,6 +1158,8 @@ static int mkv_write_trailer(AVFormatContext *s)
 
     end_ebml_master(pb, mkv->segment);
     av_free(mkv->tracks);
+    av_freep(&mkv->cues->entries);
+    av_freep(&mkv->cues);
     av_destruct_packet(&mkv->cur_audio_pkt);
     avio_flush(pb);
     return 0;



More information about the ffmpeg-cvslog mailing list