notmuch-restore: allocate a temporary talloc context for each line parsed.

[notmuch] / notmuch-restore.c

diff --git a/notmuch-restore.c b/notmuch-restore.c
index ac913754d26b4e3130fe4ba2362fcd9dd4e9d30d..9ed9b515754036ec285f2af214f52fe980d84771 100644 (file)
--- 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) {
@@ -237,13 +242,16 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
        if (ret < 0)
            break;
 
-       ret = tag_message (ctx, notmuch, query_string,
+       ret = tag_message (line_ctx, notmuch, query_string,
                           tag_ops, flags);
        if (ret)
            break;
 
     }  while ((line_len = getline (&line, &line_size, input)) != -1);
 
+    if (line_ctx != NULL)
+       talloc_free (line_ctx);
+
     if (input_format == DUMP_FORMAT_SUP)
        regfree (&regex);