Re: [PATCH 2/2] fsck: treat a NUL in a tag header as an error

[Johannes Schindelin]

Hi René,

On Thu, 19 Nov 2015, René Scharfe wrote:

> We check the return value of verify_header() for commits already, so do
> the same for tags as well.

Thanks for catching and fixing my bug!

Ciao,
Dscho

Re: [PATCH 2/2] fsck: treat a NUL in a tag header as an error

[Jeff King]

On Thu, Nov 19, 2015 at 05:25:31PM +0100, René Scharfe wrote:

> We check the return value of verify_header() for commits already, so do
> the same for tags as well.
> 
> Signed-off-by: Rene Scharfe 
> ---
>  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;

Good catch. The patch look reasonable to me.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] fsck: treat a NUL in a tag header as an error

[René Scharfe]

We check the return value of verify_header() for commits already, so do
the same for tags as well.

Signed-off-by: Rene Scharfe 
---
 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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html