[PATCH] notmuch-config: Fix memleaks.

classic Classic list List threaded Threaded
2 messages Options
Stefan Schmidt-2 Stefan Schmidt-2
Reply | Threaded
Open this post in threaded view
|

[PATCH] notmuch-config: Fix memleaks.

>From 4bb598e6e0fa32d5184be54cb5c66fe364eba374 Mon Sep 17 00:00:00 2001
From: Holger Freyther <[hidden email]>
Date: Sat, 21 Nov 2009 22:45:23 +0100
Subject: [PATCH] notmuch-config: Fix memleaks.

While talloc is great we need to free the g_error by hand.

Tested-by: Stefan Schmidt <[hidden email]>
Signed-off-by: Holger Freyther <[hidden email]>
---
 notmuch-config.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/notmuch-config.c b/notmuch-config.c
index 7252a19..aaa0372 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -207,9 +207,11 @@ notmuch_config_open (void *ctx,
     fprintf (stderr, "Error reading configuration file %s: %s\n",
      config->filename, error->message);
     talloc_free (config);
+    g_error_free (error);
     return NULL;
  }
 
+ g_error_free (error);
  is_new = 1;
     }
 
@@ -308,6 +310,7 @@ notmuch_config_save (notmuch_config_t *config)
     if (! g_file_set_contents (config->filename, data, length, &error)) {
  fprintf (stderr, "Error saving configuration to %s: %s\n",
  config->filename, error->message);
+ g_error_free (error);
  return 1;
     }
 
--
1.6.5.3


Carl Worth-2 Carl Worth-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] notmuch-config: Fix memleaks.

On Sat, 21 Nov 2009 23:17:02 +0100, Stefan Schmidt <[hidden email]> wrote:
>
> While talloc is great we need to free the g_error by hand.
>
> Tested-by: Stefan Schmidt <[hidden email]>
> Signed-off-by: Holger Freyther <[hidden email]>

Thanks to both of you! This is pushed.

As for talloc and glib, it's become clear to me that I'd really like a
talloc-friendly hash-table implementation, (and maybe a nice growing
array). I really haven't seen any other data structures in glib that I'd
need as universally as I need those, (particularly since talloc already
provides a bunch of string functions).

-Carl