From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 2/7] absolute_path(): reject the empty string
Date: Tue, 4 Sep 2012 10:14:25 +0200 [thread overview]
Message-ID: <1346746470-23127-3-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1346746470-23127-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
abspath.c | 4 +++-
t/t0000-basic.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)) {
if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX)
die("Too long path: %.*s", 60, path);
} else {
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 7347fb8..5963a6c 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -450,7 +450,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'
-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 ""
'
--
1.7.11.3
next prev parent reply other threads:[~2012-09-04 8:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 8:14 [PATCH 0/7] Fix some bugs in abspath.c mhagger
2012-09-04 8:14 ` [PATCH 1/7] t0000: verify that absolute_path() fails if passed the empty string mhagger
2012-09-04 8:14 ` mhagger [this message]
2012-09-04 8:14 ` [PATCH 3/7] t0000: verify that real_path() " mhagger
2012-09-04 8:14 ` [PATCH 4/7] real_path(): reject " mhagger
2012-09-04 8:14 ` [PATCH 5/7] t0000: verify that real_path() works correctly with absolute paths mhagger
2012-09-05 8:40 ` Johannes Sixt
2012-09-06 21:11 ` Michael Haggerty
2012-09-06 23:08 ` Junio C Hamano
2012-09-09 4:31 ` Michael Haggerty
2012-09-09 4:50 ` Junio C Hamano
2012-09-09 5:27 ` Junio C Hamano
2012-09-04 8:14 ` [PATCH 6/7] real_path(): properly handle nonexistent top-level paths mhagger
2012-09-04 8:14 ` [PATCH 7/7] t0000: verify that real_path() removes extra slashes mhagger
2012-09-04 18:19 ` Junio C Hamano
2012-09-05 10:52 ` Nguyen Thai Ngoc Duy
[not found] ` <CAGHpTB+LipLt3CgVt5O0s9xj5HHf9Y5z9QWEy+FKYH8s4O7Q2w@mail.gmail.com>
2012-09-05 11:13 ` Nguyen Thai Ngoc Duy
2012-09-06 3:23 ` Junio C Hamano
2012-09-06 5:44 ` Nguyen Thai Ngoc Duy
2012-09-06 17:34 ` Junio C Hamano
2012-09-07 1:18 ` Nguyen Thai Ngoc Duy
2012-09-05 8:40 ` Johannes Sixt
2012-09-06 22:30 ` Michael Haggerty
2012-09-04 18:08 ` [PATCH 0/7] Fix some bugs in abspath.c Junio C Hamano
2012-09-04 19:03 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346746470-23127-3-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).