summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 21:21:20 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:29:15 (GMT)
commit14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2 (patch)
treed8127060ce208c40c4f5dd67a412171154e362c6 /read-cache.c
parent268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff)
parenta5ab8d03173458b76b8452efd90a7173f490c132 (diff)
downloadgit-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.zip
git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.tar.gz
git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.tar.bz2
Sync with 2.17.3
* maint-2.17: (32 commits) Git 2.17.3 Git 2.16.6 test-drop-caches: use `has_dos_drive_prefix()` Git 2.15.4 Git 2.14.6 mingw: handle `subst`-ed "DOS drives" mingw: refuse to access paths with trailing spaces or periods mingw: refuse to access paths with illegal characters unpack-trees: let merged_entry() pass through do_add_entry()'s errors quote-stress-test: offer to test quoting arguments for MSYS2 sh t6130/t9350: prepare for stringent Win32 path validation quote-stress-test: allow skipping some trials quote-stress-test: accept arguments to test via the command-line tests: add a helper to stress test argument quoting mingw: fix quoting of arguments Disallow dubiously-nested submodule git directories protect_ntfs: turn on NTFS protection by default path: also guard `.gitmodules` against NTFS Alternate Data Streams is_ntfs_dotgit(): speed it up mingw: disallow backslash characters in tree objects' file names ...
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 3725882..eaa2709 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -868,6 +868,9 @@ int verify_path(const char *path, unsigned mode)
if (has_dos_drive_prefix(path))
return 0;
+ if (!is_valid_path(path))
+ return 0;
+
goto inside;
for (;;) {
if (!c)
@@ -895,7 +898,15 @@ inside:
if ((c == '.' && !verify_dotfile(path, mode)) ||
is_dir_sep(c) || c == '\0')
return 0;
+ } else if (c == '\\' && protect_ntfs) {
+ if (is_ntfs_dotgit(path))
+ return 0;
+ if (S_ISLNK(mode)) {
+ if (is_ntfs_dotgitmodules(path))
+ return 0;
+ }
}
+
c = *path++;
}
}