1 Return-Path: <stefan@datenfreihafen.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 53DDB431FBC
\r
6 for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 14:17:07 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 Received: from olra.theworths.org ([127.0.0.1])
\r
9 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
10 with ESMTP id izf4Gi5Uoi2C for <notmuch@notmuchmail.org>;
\r
11 Sat, 21 Nov 2009 14:17:06 -0800 (PST)
\r
12 Received: from sirius.lasnet.de (sirius.lasnet.de [78.47.116.19])
\r
13 by olra.theworths.org (Postfix) with ESMTP id 72804431FAE
\r
14 for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 14:17:06 -0800 (PST)
\r
15 Received: from p5b034af6.dip.t-dialin.net ([91.3.74.246] helo=excalibur)
\r
16 by sirius.lasnet.de with esmtpsa
\r
17 (Cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63 #1)
\r
18 id 1NByGN-0006tB-2j by authid <stefan@sostec.de> with cram_md5
\r
19 for <notmuch@notmuchmail.org>; Sat, 21 Nov 2009 23:17:05 +0100
\r
20 Received: from stefan by excalibur with local (Exim 4.69)
\r
21 (envelope-from <stefan@excalibur.local>) id 1NByGM-0000A6-AB
\r
22 for notmuch@notmuchmail.org; Sat, 21 Nov 2009 23:17:02 +0100
\r
23 Date: Sat, 21 Nov 2009 23:17:02 +0100
\r
24 From: Stefan Schmidt <stefan@datenfreihafen.org>
\r
25 To: notmuch@notmuchmail.org
\r
26 Message-ID: <20091121221702.GG24602@excalibur.local>
\r
28 Content-Type: text/plain; charset=us-ascii
\r
29 Content-Disposition: inline
\r
30 X-Mailer: Mutt http://www.mutt.org/
\r
32 X-Website: http://www.datenfreihafen.org/
\r
33 User-Agent: Mutt/1.5.20 (2009-06-14)
\r
34 Subject: [notmuch] [PATCH] notmuch-config: Fix memleaks.
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.12
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sat, 21 Nov 2009 22:17:07 -0000
\r
49 >From 4bb598e6e0fa32d5184be54cb5c66fe364eba374 Mon Sep 17 00:00:00 2001
\r
50 From: Holger Freyther <zecke@selfish.org>
\r
51 Date: Sat, 21 Nov 2009 22:45:23 +0100
\r
52 Subject: [PATCH] notmuch-config: Fix memleaks.
\r
54 While talloc is great we need to free the g_error by hand.
\r
56 Tested-by: Stefan Schmidt <stefan@datenfreihafen.org>
\r
57 Signed-off-by: Holger Freyther <zecke@selfish.org>
\r
59 notmuch-config.c | 3 +++
\r
60 1 files changed, 3 insertions(+), 0 deletions(-)
\r
62 diff --git a/notmuch-config.c b/notmuch-config.c
\r
63 index 7252a19..aaa0372 100644
\r
64 --- a/notmuch-config.c
\r
65 +++ b/notmuch-config.c
\r
66 @@ -207,9 +207,11 @@ notmuch_config_open (void *ctx,
\r
67 fprintf (stderr, "Error reading configuration file %s: %s\n",
\r
68 config->filename, error->message);
\r
69 talloc_free (config);
\r
70 + g_error_free (error);
\r
74 + g_error_free (error);
\r
78 @@ -308,6 +310,7 @@ notmuch_config_save (notmuch_config_t *config)
\r
79 if (! g_file_set_contents (config->filename, data, length, &error)) {
\r
80 fprintf (stderr, "Error saving configuration to %s: %s\n",
\r
81 config->filename, error->message);
\r
82 + g_error_free (error);
\r