diff options
| author | Vicent Marti <vicent@github.com> | 2014-08-27 19:19:55 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-08-27 19:19:55 +0200 |
| commit | 69db89342712f47ee84d9368823ec294a0db1c65 (patch) | |
| tree | 66e3836204f1253bdff24c472499feddd9ce47fd | |
| parent | 893cfe06493533581d25c2f120334fbf4961cdff (diff) | |
| parent | f0c53d21a43a098da2bf96a955ee22feb9ab8a5a (diff) | |
| download | libgit2-69db89342712f47ee84d9368823ec294a0db1c65.tar.gz | |
Merge pull request #2538 from libgit2/ntk/propagate_url_parsing_error
winhttp: Prevent swallowing of url parsing error
| -rw-r--r-- | src/transports/winhttp.c | 6 | ||||
| -rw-r--r-- | tests/online/clone.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c index 6efc01706..6523086da 100644 --- a/src/transports/winhttp.c +++ b/src/transports/winhttp.c @@ -1132,9 +1132,9 @@ static int winhttp_action( int ret = -1; if (!t->connection) - if (gitno_connection_data_from_url(&t->connection_data, url, NULL) < 0 || - winhttp_connect(t, url) < 0) - return -1; + if ((ret = gitno_connection_data_from_url(&t->connection_data, url, NULL)) < 0 || + (ret = winhttp_connect(t, url)) < 0) + return ret; if (winhttp_stream_alloc(t, &s) < 0) return -1; diff --git a/tests/online/clone.c b/tests/online/clone.c index 39b4815b1..1ccaf2773 100644 --- a/tests/online/clone.c +++ b/tests/online/clone.c @@ -463,3 +463,9 @@ void test_online_clone__ssh_cannot_change_username(void) cl_git_fail(git_clone(&g_repo, "ssh://git@github.com/libgit2/TestGitRepository", "./foo", &g_options)); } + +void test_online_clone__url_with_no_path_returns_EINVALIDSPEC(void) +{ + cl_git_fail_with(git_clone(&g_repo, "http://github.com", "./foo", &g_options), + GIT_EINVALIDSPEC); +} |