Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D56EB429E36 for ; Sun, 16 Dec 2012 12:16:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Sf6cFER3FIpC for ; Sun, 16 Dec 2012 12:16:58 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 027DB431FD2 for ; Sun, 16 Dec 2012 12:16:57 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TkKdt-0007td-94; Sun, 16 Dec 2012 16:16:57 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TkKdn-00050j-Q9; Sun, 16 Dec 2012 16:16:51 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for each line parsed. Date: Sun, 16 Dec 2012 16:16:37 -0400 Message-Id: <1355688997-19164-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355688997-19164-1-git-send-email-david@tethera.net> References: <1355688997-19164-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Dec 2012 20:16:59 -0000 From: David Bremner This lets the high level code in notmuch restore be ignorant about what the lower level code is doing as far as allocating memory. --- notmuch-restore.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/notmuch-restore.c b/notmuch-restore.c index 4b76d83..52e7ecb 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -122,6 +122,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) char *input_file_name = NULL; FILE *input = stdin; char *line = NULL; + void *line_ctx = NULL; size_t line_size; ssize_t line_len; @@ -205,10 +206,11 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) do { char *query_string; + line_ctx = talloc_new (ctx); if (input_format == DUMP_FORMAT_SUP) { - ret = parse_sup_line (ctx, line, &query_string, tag_ops); + ret = parse_sup_line (line_ctx, line, &query_string, tag_ops); } else { - ret = parse_tag_line (ctx, line, TAG_FLAG_BE_GENEROUS, + ret = parse_tag_line (line_ctx, line, TAG_FLAG_BE_GENEROUS, &query_string, tag_ops); if (ret == 0) { @@ -238,8 +240,14 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) break; } + talloc_free (line_ctx); + /* setting to NULL is important to avoid a double free */ + line_ctx = NULL; } while ((line_len = getline (&line, &line_size, input)) != -1); + if (line_ctx != NULL) + talloc_free (line_ctx); + if (input_format == DUMP_FORMAT_SUP) regfree (®ex); -- 1.7.10.4