[PATCH v3 5/7] fsck: use strbuf_getline() to read skiplist file
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 27, 2018, 19:43 UTC
- Message-ID
- <20180827194323.17055-6-avarab@gmail.com>
- In-Reply-To
- <20180827194323.17055-1-avarab@gmail.com>
From: René Scharfe <l.s.r@web.de>
buffer is unlikely to contain a NUL character, so printing its contents using %s in a die() format is unsafe (detected with ASan).
Use an idiomatic strbuf_getline() loop instead, which ensures the buffer is always NUL-terminated, supports CRLF files as well, accepts files without a newline after the last line, supports any hash length automatically, and is shorter.
Helped-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- fsck.c | 25 ++++++++++++------------- t/t5504-fetch-receive-strict.sh | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/fsck.c b/fsck.c index a0cee0be59..972a26b9ba 100644 --- a/fsck.c +++ b/fsck.c @@ -183,8 +183,9 @@ static int fsck_msg_type(enum fsck_msg_id msg_id, static void init_skiplist(struct fsck_options *options, const char *path) { static struct oid_array skiplist = OID_ARRAY_INIT; - int sorted, fd; - char buffer[GIT_MAX_HEXSZ + 1]; + int sorted; + FILE *fp; + struct strbuf sb = STRBUF_INIT; struct object_id oid; if (options->skiplist) @@ -194,25 +195,23 @@ static void init_skiplist(struct fsck_options *options, const char *path) options->skiplist = &skiplist; } - fd = open(path, O_RDONLY); - if (fd < 0) + fp = fopen(path, "r"); + if (!fp) die("Could not open skip list: %s", path); - for (;;) { + while (!strbuf_getline(&sb, fp)) { const char *p; - int result = read_in_full(fd, buffer, sizeof(buffer)); - if (result < 0) - die_errno("Could not read '%s'", path); - if (!result) - break; - if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') - die("Invalid SHA-1: %s", buffer); + if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0') + die("Invalid SHA-1: %s", sb.buf); oid_array_append(&skiplist, &oid); if (sorted && skiplist.nr > 1 && oidcmp(&skiplist.oid[skiplist.nr - 2], &oid) > 0) sorted = 0; } - close(fd); + if (ferror(fp)) + die_errno("Could not read '%s'", path); + fclose(fp); + strbuf_release(&sb); if (sorted) skiplist.sorted = 1; diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index 38aaf3b928..c7224db3bb 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetch-receive-strict.sh @@ -185,7 +185,7 @@ test_expect_success 'fsck with invalid or bogus skipList input (comments & empty test_i18ngrep "^fatal: Invalid SHA-1: " err-with-empty-line ' -test_expect_failure 'fsck no garbage output from comments & empty lines errors' ' +test_expect_success 'fsck no garbage output from comments & empty lines errors' ' test_line_count = 1 err-with-comment && test_line_count = 1 err-with-empty-line '
-- 2.19.0.rc0.228.g281dcd1b4d0