Call curl_global_cleanup on error from curl_init

archlinuxfr · May 19, 2016 · 9bee309 · 9bee309
1 parent 7a1869c
commit 9bee309
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/alpm-query.c b/src/alpm-query.c
@@ -500,7 +500,6 @@ static bool alpm_pkg_get_outofdate (alpm_pkg_t *pkg)
 {
 	CURL *curl = curl_init (CURL_GLOBAL_SSL);
 	if (!curl) {
-		curl_global_cleanup ();
 		return false;
 	}
 

diff --git a/src/aur.c b/src/aur.c
@@ -768,9 +768,7 @@ unsigned int aur_request (alpm_list_t **targets, aurrequest_t type)
 
 	CURL *curl = (strncmp (config.aur_url, "https", strlen ("https")) == 0) ?
 			curl_init (CURL_GLOBAL_SSL) : curl_init (CURL_GLOBAL_NOTHING);
-
 	if (!curl) {
-		curl_global_cleanup ();
 		return 0;
 	}
 
@@ -817,7 +815,6 @@ static char *aur_get_arch (const aurpkg_t *pkg)
 
 	CURL *curl = curl_init (CURL_GLOBAL_SSL);
 	if (!curl) {
-		curl_global_cleanup ();
 		return NULL;
 	}
 

diff --git a/src/util.c b/src/util.c
@@ -1094,6 +1094,7 @@ CURL *curl_init (long flags)
 	CURL *curl = curl_easy_init ();
 	if (!curl) {
 		perror ("curl easy");
+		curl_global_cleanup ();
 		return NULL;
 	}