]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tool_operate: allow SSL_CERT_FILE and SSL_CERT_DIR
authorDaniel Stenberg <daniel@haxx.se>
Thu, 27 Jul 2023 21:36:36 +0000 (23:36 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Sat, 29 Jul 2023 21:41:42 +0000 (23:41 +0200)
... used at once.

Reported-by: Gabriel Corona
Fixes #11325
Closes #11531

src/tool_operate.c

index 9cff7b33642cbb083cde6d903d3b3834e30dc27b..2745ceaba33dec6b011483c781b83a6cefe6e29b 100644 (file)
@@ -2595,16 +2595,16 @@ static CURLcode transfer_per_config(struct GlobalConfig *global,
           }
           capath_from_env = true;
         }
-        else {
-          env = curlx_getenv("SSL_CERT_FILE");
-          if(env) {
-            config->cacert = strdup(env);
-            if(!config->cacert) {
-              curl_free(env);
-              curl_easy_cleanup(curltls);
-              errorf(global, "out of memory");
-              return CURLE_OUT_OF_MEMORY;
-            }
+        env = curlx_getenv("SSL_CERT_FILE");
+        if(env) {
+          config->cacert = strdup(env);
+          if(!config->cacert) {
+            curl_free(env);
+            if(capath_from_env)
+              free(config->capath);
+            curl_easy_cleanup(curltls);
+            errorf(global, "out of memory");
+            return CURLE_OUT_OF_MEMORY;
           }
         }
       }