From 4583ff2ad5427ce025aff060b57b66ef6d33e2dc Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Dec 2012 23:59:48 +2000 Subject: [PATCH] [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for each line parsed. --- 6b/e417f66ea4a120c26b576bff71ff5e12774f58 | 105 ++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 6b/e417f66ea4a120c26b576bff71ff5e12774f58 diff --git a/6b/e417f66ea4a120c26b576bff71ff5e12774f58 b/6b/e417f66ea4a120c26b576bff71ff5e12774f58 new file mode 100644 index 000000000..1fc6b63bf --- /dev/null +++ b/6b/e417f66ea4a120c26b576bff71ff5e12774f58 @@ -0,0 +1,105 @@ +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 C7F59431FC4 + for ; Sun, 16 Dec 2012 20:00:52 -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 3axp-Q9cZQ+V for ; + Sun, 16 Dec 2012 20:00:51 -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 2B8F9431FD7 + for ; Sun, 16 Dec 2012 20:00:47 -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 1TkRsk-0008LX-Ez; Mon, 17 Dec 2012 00:00:46 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TkRse-0000no-WA; Mon, 17 Dec 2012 00:00:41 -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 23:59:48 -0400 +Message-Id: <1355716788-2940-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1355716788-2940-1-git-send-email-david@tethera.net> +References: <1355716788-2940-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: Mon, 17 Dec 2012 04:00:53 -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 665373f..9ed9b51 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -125,6 +125,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; + +@@ -208,10 +209,14 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) + do { + char *query_string; + ++ if (line_ctx != NULL) ++ talloc_free (line_ctx); ++ ++ 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) { +@@ -244,6 +249,9 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) + + } 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 + -- 2.26.2