From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.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 [thread overview]
Message-ID: <1355716788-2940-4-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1355716788-2940-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
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
next prev parent reply other threads:[~2012-12-17 4:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 3:59 v2 restore leak fix david
2012-12-17 3:59 ` [PATCH 1/3] notmuch-restore: fix return value propagation david
2012-12-17 3:59 ` [PATCH 2/3] tag-utils: use the tag_opt_list_t as talloc context, if possible david
2012-12-17 16:24 ` Tomi Ollila
2012-12-17 3:59 ` david [this message]
2012-12-22 21:38 ` v2 restore leak fix Jani Nikula
2012-12-23 3:34 ` David Bremner
-- strict thread matches above, loose matches on Subject: below --
2012-12-16 20:16 proposed fix for memory leak in notmuch restore david
2012-12-16 20:16 ` [PATCH 3/3] notmuch-restore: allocate a temporary talloc context for each line parsed david
2012-12-16 22:41 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355716788-2940-4-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).