Skip to content

Commit

Permalink
http.c: die if curl_*_init fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bernhard Reiter authored and Junio C Hamano committed Aug 18, 2014
1 parent 32f5660 commit faa3807
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion http.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit faa3807

Please sign in to comment.