Commit 048f837b by Ben Straub

Prevent another segfault from bad URL

parent 887df99f
......@@ -680,7 +680,7 @@ int gitno_extract_url_parts(
at = strchr(url, '@');
if (!slash ||
(colon && slash < colon)) {
(colon && (slash < colon))) {
giterr_set(GITERR_NET, "Malformed URL");
return GIT_EINVALIDSPEC;
}
......
......@@ -213,10 +213,6 @@ static int git_ssh_extract_url_parts(
colon = strchr(url, ':');
if (colon == NULL) {
giterr_set(GITERR_NET, "Malformed URL: missing :");
return -1;
}
at = strchr(url, '@');
if (at) {
......@@ -228,6 +224,11 @@ static int git_ssh_extract_url_parts(
*username = NULL;
}
if (colon == NULL || (colon < start)) {
giterr_set(GITERR_NET, "Malformed URL");
return -1;
}
*host = git__substrdup(start, colon - start);
GITERR_CHECK_ALLOC(*host);
......@@ -316,7 +317,7 @@ static int _git_ssh_setup_conn(
const char *cmd,
git_smart_subtransport_stream **stream)
{
char *host, *port=NULL, *user=NULL, *pass=NULL;
char *host=NULL, *port=NULL, *user=NULL, *pass=NULL;
const char *default_port="22";
ssh_stream *s;
LIBSSH2_SESSION* session=NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment