Re: [PATCH v2 3/8] absolute_path(): reject the empty string

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 6, 2012, 23:09 UTC
Message-ID: <7vy5kmzr3e.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1346971264-23744-4-git-send-email-mhagger@alum.mit.edu>

Michael Haggerty <mhagger@alum.mit.edu> writes:

> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---

I think I asked why this matters (iow, why it is the right thing to do to reject an empty string, instead of treating it as "the current directory") in the previous round. I would have expected to find the answer be above the S-o-b line here.

The same comment applies to the other patch for real_path().

Show 16 quoted lines

>  abspath.c             | 4 +++-
>  t/t0060-path-utils.sh | 2 +-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/abspath.c b/abspath.c
> index f04ac18..5d62430 100644
> --- a/abspath.c
> +++ b/abspath.c
> @@ -123,7 +123,9 @@ const char *absolute_path(const char *path)
>  {
>  	static char buf[PATH_MAX + 1];
>  
> -	if (is_absolute_path(path)) {
> +	if (!*path) {
> +		die("The empty string is not a valid path");
> +	} else if (is_absolute_path(path)) {

Show 15 quoted lines

>  		if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX)
>  			die("Too long path: %.*s", 60, path);
>  	} else {
> diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
> index d91e516..924aa60 100755
> --- a/t/t0060-path-utils.sh
> +++ b/t/t0060-path-utils.sh
> @@ -140,7 +140,7 @@ test_expect_success 'strip_path_suffix' '
>  		c:/msysgit/libexec//git-core libexec/git-core)
>  '
>  
> -test_expect_failure 'absolute path rejects the empty string' '
> +test_expect_success 'absolute path rejects the empty string' '
>  	test_must_fail test-path-utils absolute_path ""
>  '