Don't leak output_path. (#308546, Kjartan Maraas)

2005-06-23  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_load_from_data_dirs): Don't
	leak output_path.  (#308546, Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index f84cdd8..a39a239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c (g_key_file_load_from_data_dirs): Don't
+       leak output_path.  (#308546, Kjartan Maraas)
+
        * glib/glib.symbols: 
        * glib/gfileutils.h: 
        * glib/gfileutils.c (g_build_pathv, g_build_filenamev): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f84cdd8..a39a239 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c (g_key_file_load_from_data_dirs): Don't
+       leak output_path.  (#308546, Kjartan Maraas)
+
        * glib/glib.symbols: 
        * glib/gfileutils.h: 
        * glib/gfileutils.c (g_build_pathv, g_build_filenamev): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f84cdd8..a39a239 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c (g_key_file_load_from_data_dirs): Don't
+       leak output_path.  (#308546, Kjartan Maraas)
+
        * glib/glib.symbols: 
        * glib/gfileutils.h: 
        * glib/gfileutils.c (g_build_pathv, g_build_filenamev): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f84cdd8..a39a239 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c (g_key_file_load_from_data_dirs): Don't
+       leak output_path.  (#308546, Kjartan Maraas)
+
        * glib/glib.symbols: 
        * glib/gfileutils.h: 
        * glib/gfileutils.c (g_build_pathv, g_build_filenamev): 

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 0dc1b6c..485c862 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -612,9 +612,12 @@ g_key_file_load_from_data_dirs (GKeyFile       *key_file,
       
       if (full_path)
        *full_path = output_path;
+      else
+       g_free (output_path);
     }
 
   g_strfreev (all_data_dirs);
+
   return found_file;
 }