diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-03-09 07:03:42 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-03-09 07:03:42 +0000 |
| commit | 87c33e488395cf16269bdb3b3939b29b7a5eddbf (patch) | |
| tree | 1f9595a77496c56dc4d1f3e93095c29e3b9c0a0d | |
| parent | b3578532a8e52a843862fe174a13fd8d63128e67 (diff) | |
| download | gdm-87c33e488395cf16269bdb3b3939b29b7a5eddbf.tar.gz | |
Free leaked memory when calling g_strconcat.
2007-03-09 Brian Cameron <brian.cameron@sun.com>
* daemon/slave.c, gui/gdmsetup.c: Free leaked memory when
calling g_strconcat.
svn path=/trunk/; revision=4652
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | daemon/slave.c | 10 | ||||
| -rw-r--r-- | gui/gdmsetup.c | 7 |
3 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2007-03-09 Brian Cameron <brian.cameron@sun.com> + + * daemon/slave.c, gui/gdmsetup.c: Free leaked memory when + calling g_strconcat. + 2007-03-07 William Jon McCann <mccann@jhu.edu> * daemon/gdmconsolekit.c (open_ck_session): diff --git a/daemon/slave.c b/daemon/slave.c index 9d3862bd..1493d196 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -2584,7 +2584,10 @@ gdm_slave_greeter (void) if (ve_string_empty (g_getenv ("PATH"))) { g_setenv ("PATH", defaultpath, TRUE); } else if ( ! ve_string_empty (defaultpath)) { - g_setenv ("PATH", g_strconcat (g_getenv ("PATH"), ":", defaultpath, NULL), TRUE); + gchar *temp_string = g_strconcat (g_getenv ("PATH"), + ":", defaultpath, NULL); + g_setenv ("PATH", temp_string, TRUE); + g_free (temp_string); } g_setenv ("RUNNING_UNDER_GDM", "true", TRUE); if ( ! ve_string_empty (d->theme_name)) @@ -3082,7 +3085,10 @@ gdm_slave_chooser (void) if (ve_string_empty (g_getenv ("PATH"))) { g_setenv ("PATH", defaultpath, TRUE); } else if ( ! ve_string_empty (defaultpath)) { - g_setenv ("PATH", g_strconcat (g_getenv ("PATH"), ":", defaultpath, NULL), TRUE); + gchar *temp_string = g_strconcat (g_getenv ("PATH"), + ":", defaultpath, NULL); + g_setenv ("PATH", temp_string, TRUE); + g_free (temp_string); } g_setenv ("RUNNING_UNDER_GDM", "true", TRUE); if ( ! ve_string_empty (d->theme_name)) diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index 3a61c897..5789844e 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -6396,6 +6396,8 @@ xserver_init_definitions () static void xserver_delete (gpointer data) { + gchar temp_string; + /* Get xserver section to delete */ GtkWidget *combobox = glade_helper_get (xml_xservers, "xserver_mod_combobox", GTK_TYPE_COMBO_BOX); @@ -6403,8 +6405,9 @@ xserver_delete (gpointer data) /* Delete xserver section */ VeConfig *custom_cfg = ve_config_get (custom_config_file); - ve_config_delete_section (custom_cfg, g_strconcat (GDM_KEY_SERVER_PREFIX, - section, NULL)); + temp_string = g_strconcat (GDM_KEY_SERVER_PREFIX, section, NULL); + ve_config_delete_section (custom_cfg, temp_string); + g_free (temp_string); /* Reinitialize definitions */ xserver_init_definitions(); |