summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 20:26:31 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:26:55 (GMT)
commitd3ac8c3f27a507d0489d18b51d6deba6364a99ce (patch)
tree7571888b2d487ce6d825045231f02fb1b97dc6a8 /tree-walk.c
parent924c623e1c71b98da608f980a97f9730c021ba44 (diff)
parent66d2a6159f511924e7e0b8a21c93538879bfd622 (diff)
downloadgit-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.zip
git-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.tar.gz
git-d3ac8c3f27a507d0489d18b51d6deba6364a99ce.tar.bz2
Sync with 2.14.6
* maint-2.14: (28 commits) 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 path: safeguard `.git` against NTFS Alternate Streams Accesses clone --recurse-submodules: prevent name squatting on Windows is_ntfs_dotgit(): only verify the leading segment test-path-utils: offer to run a protectNTFS/protectHFS benchmark ...
Diffstat (limited to 'tree-walk.c')
-rw-r--r--tree-walk.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 684f0e3..7875fdc 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -41,6 +41,12 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
strbuf_addstr(err, _("empty filename in tree entry"));
return -1;
}
+#ifdef GIT_WINDOWS_NATIVE
+ if (protect_ntfs && strchr(path, '\\')) {
+ strbuf_addf(err, _("filename in tree entry contains backslash: '%s'"), path);
+ return -1;
+ }
+#endif
len = strlen(path) + 1;
/* Initialize the descriptor entry */