diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 21:38:25 +0100 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 16:27:18 +0100 |
| commit | 9ac92fed5b63176e653c3c42e2b66cdd203c906f (patch) | |
| tree | a1733918e274272dc9aecb371717c52a071254c0 /tree-walk.c | |
| parent | 27d05d1a1a62273aa3749f4d0ab8a126ef11ff66 (diff) | |
| parent | 7cdafcaacf677b9e0700fa988c247bda192db48d (diff) | |
Sync with 2.15.4
* maint-2.15: (29 commits) 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 path: safeguard `.git` against NTFS Alternate Streams Accesses clone --recurse-submodules: prevent name squatting on Windows is_ntfs_dotgit(): only verify the leading segment ...
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tree-walk.c b/tree-walk.c index 63a87ed666..3966b0ae44 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 */ |