From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 6 Sep 2012 22:40:59 +0000 (+0200)
Subject: absolute_path(): reject the empty string
X-Git-Tag: v1.8.0-rc0~57^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0601dc11fab5b4525a348b2ad6c9bb92529a281;p=thirdparty%2Fgit.git

absolute_path(): reject the empty string

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/abspath.c b/abspath.c
index f04ac18e33..5d624307d5 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)) {
 		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 d91e516750..924aa607d7 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 ""
 '