From: "René Scharfe" <l.s.r@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/4] archive-tar: turn length miscalculation warning into BUG
Date: Sat, 17 Aug 2019 18:24:23 +0200 [thread overview]
Message-ID: <f5ad09f8-9da5-9567-afe0-f1379bd9192b@web.de> (raw)
In-Reply-To: <c77a0081-93ab-7b97-e322-9616f6e7f86c@web.de>
Now that we're confident our pax extended header calculation is correct,
turn the criticality of the assertion up to the maximum, from warning
right up to BUG. Simplify the test, as the stderr comparison step would
not be reached in case the BUG message is triggered.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
archive-tar.c | 6 +++---
t/t5004-archive-corner-cases.sh | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/archive-tar.c b/archive-tar.c
index 9d09edd547..e16d3f756d 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -158,9 +158,9 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
strbuf_addch(sb, '\n');
if (len != sb->len - orig_len)
- warning("pax extended header length miscalculated as %"PRIuMAX
- ", should be %"PRIuMAX,
- (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
+ BUG("pax extended header length miscalculated as %"PRIuMAX
+ ", should be %"PRIuMAX,
+ (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
}
/*
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 4966a74b4d..3e7b23cb32 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -220,8 +220,7 @@ build_tree() {
test_expect_success 'tar archive with long paths' '
blob=$(echo foo | git hash-object -w --stdin) &&
tree=$(build_tree $blob | git mktree) &&
- git archive -o long_paths.tar $tree 2>stderr &&
- test_must_be_empty stderr
+ git archive -o long_paths.tar $tree
'
test_done
--
2.23.0
next prev parent reply other threads:[~2019-08-17 16:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-17 16:19 [PATCH 0/4] fix pax extended header length calculation René Scharfe
2019-08-17 16:23 ` [PATCH 1/4] archive-tar: report wrong pax extended header length René Scharfe
2019-08-17 16:24 ` [PATCH 2/4] archive-tar: fix pax extended header length calculation René Scharfe
2019-08-17 18:03 ` Eric Sunshine
2019-08-17 16:24 ` [PATCH 3/4] archive-tar: use size_t in strbuf_append_ext_header() René Scharfe
2019-08-17 16:24 ` René Scharfe [this message]
2019-08-17 16:40 ` [PATCH 0/4] fix pax extended header length calculation brian m. carlson
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f5ad09f8-9da5-9567-afe0-f1379bd9192b@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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://80x24.org/mirrors/git.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).