summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2004-09-28 09:12:02 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2004-09-28 09:12:02 +0000
commit175d898b8a53ca7e7fddc2a32dfbfb179b42d0dd (patch)
tree74ba8f970c8f8d148b7a01016d65eddcb37ec929
parentbb56e552f29eff1cc0d69defd4b8bcc7c553bb74 (diff)
downloadgconf-175d898b8a53ca7e7fddc2a32dfbfb179b42d0dd.tar.gz
Plug a leak. Plug a couple of leaks. Ref bug #153929. Still one to go.
2004-09-28 Kjartan Maraas <kmaraas@gnome.org> * gconf/gconf-sanity-check.c: (main): Plug a leak. * gconf/gconfd.c: (main): Plug a couple of leaks. Ref bug #153929. Still one to go.
-rw-r--r--ChangeLog6
-rw-r--r--gconf/gconf-sanity-check.c1
-rw-r--r--gconf/gconfd.c3
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bf6809ff..a9f1a774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-28 Kjartan Maraas <kmaraas@gnome.org>
+
+ * gconf/gconf-sanity-check.c: (main): Plug a leak.
+ * gconf/gconfd.c: (main): Plug a couple of leaks.
+ Ref bug #153929. Still one to go.
+
2004-09-28 Mark McLoughlin <mark@skynet.ie>
Leak identified by Kjartan in bug #153891.
diff --git a/gconf/gconf-sanity-check.c b/gconf/gconf-sanity-check.c
index 19c7b99a..08b0381a 100644
--- a/gconf/gconf-sanity-check.c
+++ b/gconf/gconf-sanity-check.c
@@ -77,6 +77,7 @@ main (int argc, char** argv)
poptBadOption(ctx, 0),
poptStrerror(nextopt),
argv[0]);
+ poptFreeContext (ctx);
return 1;
}
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 212b24cf..e9e6b4bf 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -708,6 +708,9 @@ main(int argc, char** argv)
daemon_lock = gconf_get_lock (lock_dir, &err);
}
+ g_free (gconfd_dir);
+ g_free (lock_dir);
+
if (daemon_lock != NULL)
{
/* This loads backends and so on. It needs to be done before