Use curl_global_init() and curl_global_cleanup().

Improve cleanup in case of initialization failure.

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index d0a41c5f5..fd1bfdcc4 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -3,7 +3,19 @@
 int test(char *URL)
 {
   CURLcode res;
-  CURL *curl = curl_easy_init();
+  CURL *curl;
+
+  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+    fprintf(stderr, "curl_global_init() failed\n");
+    return TEST_ERR_MAJOR_BAD;
+  }
+
+  if ((curl = curl_easy_init()) == NULL) {
+    fprintf(stderr, "curl_easy_init() failed\n");
+    curl_global_cleanup();
+    return TEST_ERR_MAJOR_BAD;
+  }
+
   curl_easy_setopt(curl, CURLOPT_PROXY, arg2);
   curl_easy_setopt(curl, CURLOPT_URL, URL);
   curl_easy_setopt(curl, CURLOPT_PORT, 19999);
@@ -11,7 +23,10 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
 
   res = curl_easy_perform(curl);
+
   curl_easy_cleanup(curl);
+  curl_global_cleanup();
+
   return (int)res;
 }