summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reiter <ockham@raz.or.at>2014-08-13 19:31:24 +0200
committerJunio C Hamano <gitster@pobox.com>2014-08-18 10:11:42 -0700
commitfaa3807cfe95bace6eaa9e8775520fab713c27d0 (patch)
treefe8c11492a52183d49e8d14e26f62262f1597a6b
parent32f56600bb6ac6fc57183e79d2c1515dfa56672f (diff)
downloadgit-faa3807cfe95bace6eaa9e8775520fab713c27d0.tar.gz
http.c: die if curl_*_init fails
Signed-off-by: Bernhard Reiter <ockham@raz.or.at> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--http.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/http.c b/http.c
index 94e1afdee7..0276aa9426 100644
--- a/http.c
+++ b/http.c
@@ -300,6 +300,9 @@ static CURL *get_curl_handle(void)
{
CURL *result = curl_easy_init();
+ if (!result)
+ die("curl_easy_init failed");
+
if (!curl_ssl_verify) {
curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
@@ -399,7 +402,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
git_config(urlmatch_config_entry, &config);
free(normalized_url);
- curl_global_init(CURL_GLOBAL_ALL);
+ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
+ die("curl_global_init failed");
http_proactive_auth = proactive_auth;