From: Bernhard Reiter <ockham@raz.or.at>
Date: Wed, 13 Aug 2014 17:31:24 +0000 (+0200)
Subject: http.c: die if curl_*_init fails
X-Git-Tag: v2.2.0-rc0~144^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa3807cfe95bace6eaa9e8775520fab713c27d0;p=git

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>
---

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;