From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 27 Jul 2023 21:36:36 +0000 (+0200)
Subject: tool_operate: allow SSL_CERT_FILE and SSL_CERT_DIR
X-Git-Tag: curl-8_3_0~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29bce9857a12b6cfa726a5;p=thirdparty%2Fcurl.git

tool_operate: allow SSL_CERT_FILE and SSL_CERT_DIR

... used at once.

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

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 9cff7b3364..2745ceaba3 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -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;
           }
         }
       }