From: "René Scharfe" <l.s.r@web•de>
To: Git List <git@vger•kernel.org>
Cc: Junio C Hamano <gitster@pobox•com>, Jeff King <peff@peff•net>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: [PATCH 2/2] fsck: treat a NUL in a tag header as an error
Date: Thu, 19 Nov 2015 17:25:31 +0100 [thread overview]
Message-ID: <564DF7FB.3090704@web.de> (raw)
In-Reply-To: <564DF6BE.6020609@web.de>
We check the return value of verify_header() for commits already, so do
the same for tags as well.
Signed-off-by: Rene Scharfe <l.s.r@web•de>
---
fsck.c | 3 ++-
t/t1450-fsck.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index e41e753..4060f1f 100644
--- a/fsck.c
+++ b/fsck.c
@@ -711,7 +711,8 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
}
}
- if (verify_headers(buffer, size, &tag->object, options))
+ ret = verify_headers(buffer, size, &tag->object, options);
+ if (ret)
goto done;
if (!skip_prefix(buffer, "object ", &buffer)) {
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 6c96953..e66b7cb 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -288,7 +288,7 @@ test_expect_success 'tag with bad tagger' '
grep "error in tag .*: invalid author/committer" out
'
-test_expect_failure 'tag with NUL in header' '
+test_expect_success 'tag with NUL in header' '
sha=$(git rev-parse HEAD) &&
q_to_nul >tag-NUL-header <<-EOF &&
object $sha
--
2.6.3
next prev parent reply other threads:[~2015-11-19 16:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 16:20 [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags René Scharfe
2015-11-19 16:25 ` René Scharfe [this message]
2015-11-20 11:13 ` [PATCH 2/2] fsck: treat a NUL in a tag header as an error Jeff King
2015-11-20 20:18 ` Johannes Schindelin
2015-11-19 20:33 ` [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags Eric Sunshine
2015-11-19 20:54 ` René Scharfe
2015-11-20 11:14 ` Jeff King
2015-11-20 20:49 ` René Scharfe
2015-11-20 20:50 ` [PATCH 3/2] test: factor out helper function test_must_contain René Scharfe
2015-11-21 8:11 ` Johannes Sixt
2015-11-21 9:35 ` René Scharfe
2015-11-20 20:50 ` [PATCH 4/2] test: use test_must_contain René Scharfe
2015-11-21 1:16 ` SZEDER Gábor
2015-11-21 2:30 ` René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=564DF7FB.3090704@web.de \
--to=l.s.r@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox