From aae23d47b270974ad0b2b01ddc734042f0951172 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 27 Dec 2012 15:36:33 +2000 Subject: [PATCH] [PATCH 2/2] notmuch-restore: handle empty input file, leading blank lines and comments. --- b6/d4a5d98e43d532093832a4eb6ef210ae4ddb5e | 133 ++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 b6/d4a5d98e43d532093832a4eb6ef210ae4ddb5e diff --git a/b6/d4a5d98e43d532093832a4eb6ef210ae4ddb5e b/b6/d4a5d98e43d532093832a4eb6ef210ae4ddb5e new file mode 100644 index 000000000..6e5e4c323 --- /dev/null +++ b/b6/d4a5d98e43d532093832a4eb6ef210ae4ddb5e @@ -0,0 +1,133 @@ +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 67967431FC3 + for ; Wed, 26 Dec 2012 11:36:57 -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 REOtWhsLxg02 for ; + Wed, 26 Dec 2012 11:36:56 -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 4E95F431FAF + for ; Wed, 26 Dec 2012 11:36:56 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] 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 1Tnwmd-0002oq-Co; Wed, 26 Dec 2012 15:36:55 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TnwmX-0005eQ-Ri; Wed, 26 Dec 2012 15:36:49 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] notmuch-restore: handle empty input file, + leading blank lines and comments. +Date: Wed, 26 Dec 2012 15:36:33 -0400 +Message-Id: <1356550593-21683-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1356550593-21683-1-git-send-email-david@tethera.net> +References: <1356550593-21683-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: Wed, 26 Dec 2012 19:36:57 -0000 + +From: David Bremner + +This patch corrects several undesirable behaviours: + +1) Empty files were not detected, leading to buffer read overrun. + +2) An initial blank line cause restore to silently abort + +3) Initial comment line caused format detection to fail +--- + notmuch-restore.c | 17 ++++++++++++----- + test/dump-restore | 3 --- + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/notmuch-restore.c b/notmuch-restore.c +index 9ed9b51..c93f1ac 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -180,11 +180,6 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) + argv[opt_index]); + return 1; + } +- char *p; +- +- line_len = getline (&line, &line_size, input); +- if (line_len == 0) +- return 0; + + tag_ops = tag_op_list_create (ctx); + if (tag_ops == NULL) { +@@ -192,6 +187,18 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) + return 1; + } + ++ do { ++ line_len = getline (&line, &line_size, input); ++ ++ /* empty input file not considered an error */ ++ if (line_len < 0) ++ return 0; ++ ++ } while ((line_len == 0) || ++ (line[0] == '#') || ++ (strspn (line, " \t\n") == strlen (line))); ++ ++ char *p; + for (p = line; (input_format == DUMP_FORMAT_AUTO) && *p; p++) { + if (*p == '(') + input_format = DUMP_FORMAT_SUP; +diff --git a/test/dump-restore b/test/dump-restore +index c2ddb92..ae30cd1 100755 +--- a/test/dump-restore ++++ b/test/dump-restore +@@ -146,13 +146,11 @@ cat < comments-and-blanks + EOF + + test_begin_subtest 'restoring empty file is not an error' +-test_subtest_known_broken + notmuch restore < /dev/null 2>OUTPUT.$test_count + cp /dev/null EXPECTED + test_expect_equal_file EXPECTED OUTPUT.$test_count + + test_begin_subtest 'file of comments and blank lines is not an error' +-test_subtest_known_broken + notmuch restore --input=comments-and-blanks + ret_val=$? + test_expect_equal "$ret_val" "0" +@@ -172,7 +170,6 @@ echo "yun1vjwegii.fsf@aiko.keithp.com (another_tag)" \ + >> leading-comments-blanks-sup + + test_begin_subtest 'detect format=sup with leading comments and blanks' +-test_subtest_known_broken + notmuch restore --input=leading-comments-blanks-sup + notmuch search --output=tags id:yun1vjwegii.fsf@aiko.keithp.com > OUTPUT.$test_count + echo "another_tag" > EXPECTED +-- +1.7.10.4 + -- 2.26.2