mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v2.9.5' into maint-2.10

Browse Source 
Git 2.9.5
This commit is contained in:
Junio C Hamano
2017-07-30 14:57:33 -07:00
parent 840ed14198 4d4165b80d
commit d78f06a1b7
9 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
connect.c
View File

@ -557,6 +557,11 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
get_host_and_port(&host, &port);
if (looks_like_command_line_option(host))
die("strange hostname '%s' blocked", host);
if (looks_like_command_line_option(port))
die("strange port '%s' blocked", port);
proxy = xmalloc(sizeof(*proxy));
child_process_init(proxy);
argv_array_push(&proxy->args, git_proxy_command);
@ -739,6 +744,9 @@ struct child_process *git_connect(int fd[2], const char *url,
conn = xmalloc(sizeof(*conn));
child_process_init(conn);
if (looks_like_command_line_option(path))
die("strange pathname '%s' blocked", path);
strbuf_addstr(&cmd, prog);
strbuf_addch(&cmd, ' ');
sq_quote_buf(&cmd, path);
@ -771,6 +779,9 @@ struct child_process *git_connect(int fd[2], const char *url,
return NULL;
}
if (looks_like_command_line_option(ssh_host))
die("strange hostname '%s' blocked", ssh_host);
ssh = get_ssh_command();
if (!ssh) {
const char *base;