Plug memory leak. (#140770, John Ehresman)

2004-04-25  Tor Lillqvist  <tml@iki.fi>

	* glib/gwin32.c (g_win32_get_package_installation_subdirectory):
	Plug memory leak. (#140770, John Ehresman)

diff --git a/ChangeLog b/ChangeLog
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a3e70a305ec8cc09bedb9d013d4c3f064c934a60..605e72d08540f44cf023233df43dedbba1427da0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-04-25  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gwin32.c (g_win32_get_package_installation_subdirectory):
+       Plug memory leak. (#140770, John Ehresman)
+
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases): 

diff --git a/glib/gwin32.c b/glib/gwin32.c
index 5ba11992bf81f416de04e801842efe8ed1af01fc..5d0bb62d7641ae68289f1037c1517c5c9e438935 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -1288,8 +1288,12 @@ g_win32_get_package_installation_subdirectory (gchar *package,
                                               gchar *subdir)
 {
   gchar *prefix;
+  gchar *dirname;
 
   prefix = g_win32_get_package_installation_directory (package, dll_name);
 
-  return g_build_filename (prefix, subdir, NULL);
+  dirname = g_build_filename (prefix, subdir, NULL);
+  g_free (prefix);
+
+  return dirname;
 }