Imported Upstream version 7.50.2

[platform/upstream/curl.git] / tests / libtest / libauthretry.c

diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c
index eabe5bf..994f9de 100644 (file)
--- a/tests/libtest/libauthretry.c
+++ b/tests/libtest/libauthretry.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -32,13 +32,14 @@ static CURLcode send_request(CURL *curl, const char *url, int seq,
                              long auth_scheme, const char *userpwd)
 {
   CURLcode res;
-  char* full_url = malloc(strlen(url) + 4 + 1);
-  if (!full_url) {
+  size_t len = strlen(url) + 4 + 1;
+  char* full_url = malloc(len);
+  if(!full_url) {
     fprintf(stderr, "Not enough memory for full url\n");
     return CURLE_OUT_OF_MEMORY;
   }
 
-  sprintf(full_url, "%s%04d", url, seq);
+  snprintf(full_url, len, "%s%04d", url, seq);
   fprintf(stderr, "Sending new request %d to %s with credential %s "
           "(auth %ld)\n", seq, full_url, userpwd, auth_scheme);
   test_setopt(curl, CURLOPT_URL, full_url);
@@ -69,13 +70,13 @@ static CURLcode send_right_password(CURL *curl, const char *url, int seq,
 
 static long parse_auth_name(const char *arg)
 {
-  if (!arg)
+  if(!arg)
     return CURLAUTH_NONE;
-  if (strequal(arg, "basic"))
+  if(strequal(arg, "basic"))
     return CURLAUTH_BASIC;
-  if (strequal(arg, "digest"))
+  if(strequal(arg, "digest"))
     return CURLAUTH_DIGEST;
-  if (strequal(arg, "ntlm"))
+  if(strequal(arg, "ntlm"))
     return CURLAUTH_NTLM;
   return CURLAUTH_NONE;
 }
@@ -88,58 +89,58 @@ int test(char *url)
   long main_auth_scheme = parse_auth_name(libtest_arg2);
   long fallback_auth_scheme = parse_auth_name(libtest_arg3);
 
-  if (main_auth_scheme == CURLAUTH_NONE ||
+  if(main_auth_scheme == CURLAUTH_NONE ||
       fallback_auth_scheme == CURLAUTH_NONE) {
     fprintf(stderr, "auth schemes not found on commandline\n");
     return TEST_ERR_MAJOR_BAD;
   }
 
-  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+  if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     fprintf(stderr, "curl_global_init() failed\n");
     return TEST_ERR_MAJOR_BAD;
   }
 
   /* Send wrong password, then right password */
 
-  if ((curl = curl_easy_init()) == NULL) {
+  if((curl = curl_easy_init()) == NULL) {
     fprintf(stderr, "curl_easy_init() failed\n");
     curl_global_cleanup();
     return TEST_ERR_MAJOR_BAD;
   }
 
   res = send_wrong_password(curl, url, 100, main_auth_scheme);
-  if (res != CURLE_OK)
-      goto test_cleanup;
+  if(res != CURLE_OK)
+    goto test_cleanup;
   curl_easy_reset(curl);
 
   res = send_right_password(curl, url, 200, fallback_auth_scheme);
-  if (res != CURLE_OK)
-      goto test_cleanup;
+  if(res != CURLE_OK)
+    goto test_cleanup;
   curl_easy_reset(curl);
 
   curl_easy_cleanup(curl);
 
   /* Send wrong password twice, then right password */
 
-  if ((curl = curl_easy_init()) == NULL) {
+  if((curl = curl_easy_init()) == NULL) {
     fprintf(stderr, "curl_easy_init() failed\n");
     curl_global_cleanup();
     return TEST_ERR_MAJOR_BAD;
   }
 
   res = send_wrong_password(curl, url, 300, main_auth_scheme);
-  if (res != CURLE_OK)
-      goto test_cleanup;
+  if(res != CURLE_OK)
+    goto test_cleanup;
   curl_easy_reset(curl);
 
   res = send_wrong_password(curl, url, 400, fallback_auth_scheme);
-  if (res != CURLE_OK)
-      goto test_cleanup;
+  if(res != CURLE_OK)
+    goto test_cleanup;
   curl_easy_reset(curl);
 
   res = send_right_password(curl, url, 500, fallback_auth_scheme);
-  if (res != CURLE_OK)
-      goto test_cleanup;
+  if(res != CURLE_OK)
+    goto test_cleanup;
   curl_easy_reset(curl);
 
 test_cleanup: