1 Return-Path: <bremner@tethera.net>
\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 D56EB429E36
\r
6 for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 12:16:58 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Sf6cFER3FIpC for <notmuch@notmuchmail.org>;
\r
16 Sun, 16 Dec 2012 12:16:58 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 027DB431FD2
\r
21 for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 12:16:57 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TkKdt-0007td-94; Sun, 16 Dec 2012 16:16:57 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TkKdn-00050j-Q9; Sun, 16 Dec 2012 16:16:51 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for
\r
35 Date: Sun, 16 Dec 2012 16:16:37 -0400
\r
36 Message-Id: <1355688997-19164-4-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1355688997-19164-1-git-send-email-david@tethera.net>
\r
39 References: <1355688997-19164-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Sun, 16 Dec 2012 20:16:59 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 This lets the high level code in notmuch restore be ignorant about
\r
59 what the lower level code is doing as far as allocating memory.
\r
61 notmuch-restore.c | 12 ++++++++++--
\r
62 1 file changed, 10 insertions(+), 2 deletions(-)
\r
64 diff --git a/notmuch-restore.c b/notmuch-restore.c
\r
65 index 4b76d83..52e7ecb 100644
\r
66 --- a/notmuch-restore.c
\r
67 +++ b/notmuch-restore.c
\r
68 @@ -122,6 +122,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
\r
69 char *input_file_name = NULL;
\r
70 FILE *input = stdin;
\r
72 + void *line_ctx = NULL;
\r
76 @@ -205,10 +206,11 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
\r
80 + line_ctx = talloc_new (ctx);
\r
81 if (input_format == DUMP_FORMAT_SUP) {
\r
82 - ret = parse_sup_line (ctx, line, &query_string, tag_ops);
\r
83 + ret = parse_sup_line (line_ctx, line, &query_string, tag_ops);
\r
85 - ret = parse_tag_line (ctx, line, TAG_FLAG_BE_GENEROUS,
\r
86 + ret = parse_tag_line (line_ctx, line, TAG_FLAG_BE_GENEROUS,
\r
87 &query_string, tag_ops);
\r
90 @@ -238,8 +240,14 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
\r
94 + talloc_free (line_ctx);
\r
95 + /* setting to NULL is important to avoid a double free */
\r
97 } while ((line_len = getline (&line, &line_size, input)) != -1);
\r
99 + if (line_ctx != NULL)
\r
100 + talloc_free (line_ctx);
\r
102 if (input_format == DUMP_FORMAT_SUP)
\r