Sync with Git 2.13.7
* maint-2.13: Git 2.13.7 verify_path: disallow symlinks in .gitmodules update-index: stat updated files earlier verify_dotfile: mention case-insensitivity in comment verify_path: drop clever fallthrough skip_prefix: add case-insensitive variant is_{hfs,ntfs}_dotgitmodules: add tests is_ntfs_dotgit: match other .git files is_hfs_dotgit: match other .git files is_ntfs_dotgit: use a size_t for traversing string submodule-config: verify submodule names as paths
This commit is contained in:
@ -182,6 +182,31 @@ static struct submodule *cache_lookup_name(struct submodule_cache *cache,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int check_submodule_name(const char *name)
|
||||
{
|
||||
/* Disallow empty names */
|
||||
if (!*name)
|
||||
return -1;
|
||||
|
||||
/*
|
||||
* Look for '..' as a path component. Check both '/' and '\\' as
|
||||
* separators rather than is_dir_sep(), because we want the name rules
|
||||
* to be consistent across platforms.
|
||||
*/
|
||||
goto in_component; /* always start inside component */
|
||||
while (*name) {
|
||||
char c = *name++;
|
||||
if (c == '/' || c == '\\') {
|
||||
in_component:
|
||||
if (name[0] == '.' && name[1] == '.' &&
|
||||
(!name[2] || name[2] == '/' || name[2] == '\\'))
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int name_and_item_from_var(const char *var, struct strbuf *name,
|
||||
struct strbuf *item)
|
||||
{
|
||||
@ -193,6 +218,12 @@ static int name_and_item_from_var(const char *var, struct strbuf *name,
|
||||
return 0;
|
||||
|
||||
strbuf_add(name, subsection, subsection_len);
|
||||
if (check_submodule_name(name->buf) < 0) {
|
||||
warning(_("ignoring suspicious submodule name: %s"), name->buf);
|
||||
strbuf_release(name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
strbuf_addstr(item, key);
|
||||
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user