Use curl_global_init() and curl_global_cleanup().

Improve cleanup in case of initialization failure.

1 files changed, 34 insertions, 9 deletions

diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index 88c65767d..987296c7a 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -27,23 +27,36 @@ int test(char *URL)
   int running;
   char done=FALSE;
   CURLM *m;
-  int i;
+  int i, j;
   struct timeval ml_start;
   struct timeval mp_start;
   char ml_timedout = FALSE;
   char mp_timedout = FALSE;
 
-  /* 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");
+    return TEST_ERR_MAJOR_BAD;
+  }
 
-  m = curl_multi_init();
+  if ((m = curl_multi_init()) == NULL) {
+    fprintf(stderr, "curl_multi_init() failed\n");
+    curl_global_cleanup();
+    return TEST_ERR_MAJOR_BAD;
+  }
 
   /* get NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
     curl[i] = curl_easy_init();
     if(!curl[i]) {
+      fprintf(stderr, "curl_easy_init() failed "
+              "on handle #%d\n", i);
+      for (j=i-1; j >= 0; j--) {
+        curl_multi_remove_handle(m, curl[j]);
+        curl_easy_cleanup(curl[j]);
+      }
+      curl_multi_cleanup(m);
       curl_global_cleanup();
-      return 100 + i; /* major bad */
+      return TEST_ERR_MAJOR_BAD + i;
     }
     curl_easy_setopt(curl[i], CURLOPT_URL, URL);
 
@@ -53,7 +66,19 @@ int test(char *URL)
     /* include headers */
     curl_easy_setopt(curl[i], CURLOPT_HEADER, 1);
 
-    res = (int)curl_multi_add_handle(m, curl[i]);
+    /* add handle to multi */
+    if ((res = (int)curl_multi_add_handle(m, curl[i])) != CURLM_OK) {
+      fprintf(stderr, "curl_multi_add_handle() failed, "
+              "on handle #%d with code %d\n", i, res);
+      curl_easy_cleanup(curl[i]);
+      for (j=i-1; j >= 0; j--) {
+        curl_multi_remove_handle(m, curl[j]);
+        curl_easy_cleanup(curl[j]);
+      }
+      curl_multi_cleanup(m);
+      curl_global_cleanup();
+      return TEST_ERR_MAJOR_BAD + i;
+    }
   }
 
   curl_multi_setopt(m, CURLMOPT_PIPELINING, 1);
@@ -124,17 +149,17 @@ 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;
   }
 
-  /* get NUM_HANDLES easy handles */
+  /* cleanup NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
     curl_multi_remove_handle(m, curl[i]);
     curl_easy_cleanup(curl[i]);
   }
 
   curl_multi_cleanup(m);
-
   curl_global_cleanup();
+
   return res;
 }