Use curl_global_init() and curl_global_cleanup().

Improve cleanup in case of initialization failure.

1 files changed, 25 insertions, 9 deletions

diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index 01f34118a..8d837056b 100644
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -49,15 +49,17 @@ int test(char *URL)
      an example! */
   hd_src = fopen(arg2, "rb");
 
-  /* In windows, this will init the winsock stuff */
-  curl_global_init(CURL_GLOBAL_ALL);
+  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+    fprintf(stderr, "curl_global_init() failed\n");
+    fclose(hd_src);
+    return TEST_ERR_MAJOR_BAD;
+  }
 
-  /* get a curl handle */
-  curl = curl_easy_init();
-  if(!curl) {
+  if ((curl = curl_easy_init()) == NULL) {
+    fprintf(stderr, "curl_easy_init() failed\n");
     fclose(hd_src);
     curl_global_cleanup();
-    return 100; /* major bad */
+    return TEST_ERR_MAJOR_BAD;
   }
 
   /* enable uploading */
@@ -87,9 +89,23 @@ int test(char *URL)
   curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE,
                    (curl_off_t)file_info.st_size);
 
-  m = curl_multi_init();
+  if ((m = curl_multi_init()) == NULL) {
+    fprintf(stderr, "curl_multi_init() failed\n");
+    curl_easy_cleanup(curl);
+    curl_global_cleanup();
+    fclose(hd_src);
+    return TEST_ERR_MAJOR_BAD;
+  }
 
-  res = (int)curl_multi_add_handle(m, curl);
+  if ((res = (int)curl_multi_add_handle(m, curl)) != CURLM_OK) {
+    fprintf(stderr, "curl_multi_add_handle() failed, "
+            "with code %d\n", res);
+    curl_multi_cleanup(m);
+    curl_easy_cleanup(curl);
+    curl_global_cleanup();
+    fclose(hd_src);
+    return TEST_ERR_MAJOR_BAD;
+  }
 
   ml_timedout = FALSE;
   ml_start = curlx_tvnow();
@@ -155,7 +171,7 @@ int test(char *URL)
     if (mp_timedout) fprintf(stderr, "mp_timedout\n");
     fprintf(stderr, "ABORTING TEST, since it seems "
             "that it would have run forever.\n");
-    res = 77;
+    res = TEST_ERR_RUNS_FOREVER;
   }
 
 #ifdef LIB529