diff options
| author |  David Bremner <bremner@debian.org> | 2012-12-26 15:36:33 -0400 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2013-01-06 10:04:19 -0400 |
| commit | d705a6a45bf691b60101203bd09a459be255dceb (patch) | |
| tree | 8b6cdece4639058e6151cfefa62470ed942865b7 | |
| parent | 4dea9bb442f18081347708bc5446db505441fbba (diff) | |
notmuch-restore: handle empty input file, leading blank lines and comments.
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
| -rw-r--r-- | notmuch-restore.c | 18 | ||||
| -rwxr-xr-x | test/dump-restore | 3 |
2 files changed, 13 insertions, 8 deletions
diff --git a/notmuch-restore.c b/notmuch-restore.c index d43546d3..f4369898 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -181,11 +181,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) { @@ -193,6 +188,19 @@ 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] == '#') || + /* the cast is safe because we checked about for line_len < 0 */ + (strspn (line, " \t\n") == (unsigned)line_len)); + + 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 c2ddb921..ae30cd10 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -146,13 +146,11 @@ cat <<EOF > 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 |