From: René Scharfe <l.s.r@web.de>
Date: Thu, 19 Nov 2015 16:25:31 +0000 (+0100)
Subject: fsck: treat a NUL in a tag header as an error
X-Git-Tag: v2.7.0-rc0~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a272f291a34dcc01bad174922de5fd4c9df2cee;p=thirdparty%2Fgit.git

fsck: treat a NUL in a tag header as an error

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>
Signed-off-by: Jeff King <peff@peff.net>
---

diff --git a/fsck.c b/fsck.c
index e41e753d6d..4060f1f551 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 6c96953628..e66b7cb697 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