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

Merge tag 'v2.13.5' into maint

Browse Source
This commit is contained in:
Junio C Hamano
2017-08-04 12:40:37 -07:00
parent 4384e3cde2 7234152e66
commit 230ce07d13
14 changed files with 130 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
connect.c
View File

@ -578,6 +578,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);
@ -824,6 +829,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);
@ -857,6 +865,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)
handle_ssh_variant(ssh, 1, &port_option,