From 8bad258e0d4b1858c6cf95785f9aae0a2fd7760e Mon Sep 17 00:00:00 2001
From: al <al@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 23 Jul 2004 16:10:21 +0000
Subject: false-use-of-get_path() memleak fixes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12891 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 input/input.c |  5 ++++-
 mplayer.c     | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/input/input.c b/input/input.c
index 5287dee7b1..271b8d102f 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1484,7 +1484,10 @@ mp_input_init(void) {
   if(!file)
     return;
   
-  if(! mp_input_parse_config(file)) {
+  if( mp_input_parse_config(file)) {
+    free(file); // release the buffer created by get_path()
+  }
+  else {
     // Try global conf dir
     file = MPLAYER_CONFDIR "/input.conf";
     if(! mp_input_parse_config(file))
diff --git a/mplayer.c b/mplayer.c
index 50986a0352..10a7773d6e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -723,6 +723,7 @@ void update_set_of_subtitles()
 int main(int argc,char* argv[]){
 
 
+char * mem_ptr;
 
 static demux_stream_t *d_audio=NULL;
 static demux_stream_t *d_video=NULL;
@@ -904,7 +905,7 @@ int gui_no_filename=0;
 
 // check codec.conf
 if(!codecs_file || !parse_codec_cfg(codecs_file)){
-  if(!parse_codec_cfg(get_path("codecs.conf"))){
+  if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
     if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
       if(!parse_codec_cfg(NULL)){
 	mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
@@ -913,6 +914,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
       mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
     }
   }
+  free( mem_ptr ); // release the buffer created by get_path()
 }
 
 #if 0
@@ -1083,7 +1085,8 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
        if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
   } else {
       // try default:
-       vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
+       vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1);
+       free(mem_ptr); // release the buffer created by get_path()
        if(!vo_font)
        vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
   }
@@ -1649,11 +1652,13 @@ if(sh_video) {
     char *psub = get_path( "sub/" );
     char **tmp = sub_filenames((psub ? psub : ""), filename);
     char **tmp2 = tmp;
+    free(psub); // release the buffer created by get_path() above
     while (*tmp2)
         add_subtitles (*tmp2++, sh_video->fps, 0);
     free(tmp);
     if (set_of_sub_size == 0)
-        add_subtitles (get_path("default.sub"), sh_video->fps, 1);
+        add_subtitles (mem_ptr=get_path("default.sub"), sh_video->fps, 1);
+    free(mem_ptr); // release the buffer created by get_path()
     if (set_of_sub_size > 0)
         add_subtitles (NULL, sh_video->fps, 1);
   }
-- 
cgit v1.2.3