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

rscharfe · peff · commit 8a272f291a34 · 2015-11-20T08:02:07.000-05:00
We check the return value of verify_header() for commits already, so do
the same for tags as well.

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,8 @@ static int fsck_tag_buffer(struct tag tag, const char data,`
`711`	`711`	`}`
`712`	`712`	`}`
`713`	`713`
`714`		`- if (verify_headers(buffer, size, &tag->object, options))`
	`714`	`+ ret = verify_headers(buffer, size, &tag->object, options);`
	`715`	`+ if (ret)`
`715`	`716`	`goto done;`
`716`	`717`
`717`	`718`	`if (!skip_prefix(buffer, "object ", &buffer)) {`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ test_expect_success 'tag with bad tagger' '`
`288`	`288`	`grep "error in tag .*: invalid author/committer" out`
`289`	`289`	`'`
`290`	`290`
`291`		`-test_expect_failure 'tag with NUL in header' '`
	`291`	`+test_expect_success 'tag with NUL in header' '`
`292`	`292`	`sha=$(git rev-parse HEAD) &&`
`293`	`293`	`q_to_nul >tag-NUL-header <<-EOF &&`
`294`	`294`	`object $sha`