Fix a double free() which causes a crash on first start, when theme_dir

2006-11-03  Loïc Minier <lool@dooz.org>

	* src/config.c: Fix a double free() which causes a crash on
	first start, when theme_dir isn't set. Fixes #114425.

diff --git a/ChangeLog b/ChangeLog
index 954be27dc61024a41cd264a4bc91dd930fb7eacb..0232b397919125d5e72e05e607cfdb6240b1bef5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03  Loïc Minier <lool@dooz.org>
+
+       * src/config.c: Fix a double free() which causes a crash on
+       first start, when theme_dir isn't set. Fixes #114425.
+
 2006-09-02  Jordi Mallach  <jordi@sindominio.net>
 
        * configure.in: Release gtetrinet 0.7.10.

diff --git a/src/config.c b/src/config.c
index 33f8cb3610a7fb120c09dfdd8bbcc1e6878769ce..e6e46c35568dbf7b4613e05a352fd65a80a0ad3b 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -193,7 +193,6 @@ void config_loadconfig (void)
     /* if there is no theme configured, then we fallback to DEFAULTTHEME */
     if (!p || !p[0])
     {
-      g_free (p);
       g_string_assign(currenttheme, DEFAULTTHEME);
       gconf_client_set_string (gconf_client, "/apps/gtetrinet/themes/theme_dir", currenttheme->str, NULL);
     }