diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-01-06 14:45:23 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-06 09:34:20 -0800 |
commit | bf10cf70ad0c777dbbbb00bbb741436e285c2181 (patch) | |
tree | 25bfc27da6b48b62026facef9f872a9105159238 | |
parent | safe_create_leading_directories(): rename local variable (diff) | |
download | tgif-bf10cf70ad0c777dbbbb00bbb741436e285c2181.tar.xz |
safe_create_leading_directories(): split on first of multiple slashes
If the input path has multiple slashes between path components (e.g.,
"foo//bar"), then the old code was breaking the path at the last
slash, not the first one. So in the above example, the second slash
was overwritten with NUL, resulting in the parent directory being
sought as "foo/".
When stat() is called on "foo/", it fails with ENOTDIR if "foo" exists
but is not a directory. This caused the wrong path to be taken in the
subsequent logic.
So instead, split path components at the first intercomponent slash
rather than the last one.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | sha1_file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 4dd16c38f6..1d9cc1b66f 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -115,9 +115,10 @@ int safe_create_leading_directories(char *path) if (!slash) break; - while (*(slash + 1) == '/') - slash++; + next_component = slash + 1; + while (*next_component == '/') + next_component++; if (!*next_component) break; |