Mark global flag for curl isInit as false on Shutdown

aws · Jan 4, 2024 · da08cdf · da08cdf
1 parent 807de43
commit da08cdf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp
@@ -506,17 +506,23 @@ void CurlHttpClient::InitGlobalState()
             << ", ssl version: " << curlVersionData->ssl_version);
         isInit = true;
 #ifdef USE_AWS_MEMORY_MANAGEMENT
-        curl_global_init_mem(CURL_GLOBAL_ALL, &malloc_callback, &free_callback, &realloc_callback, &strdup_callback, &calloc_callback);
+        CURLcode curlResponseCode = curl_global_init_mem(CURL_GLOBAL_ALL, &malloc_callback, &free_callback, &realloc_callback, &strdup_callback, &calloc_callback);
 #else
-        curl_global_init(CURL_GLOBAL_ALL);
+        CURLcode curlResponseCode = curl_global_init(CURL_GLOBAL_ALL);
 #endif
+        if (curlResponseCode != CURLE_OK)
+        {
+            AWS_LOGSTREAM_FATAL(CURL_HTTP_CLIENT_TAG, "Failed to init curl, return code " << curlResponseCode);
+            isInit = false;
+        }
     }
 }
 
 
 void CurlHttpClient::CleanupGlobalState()
 {
     curl_global_cleanup();
+    isInit = false;
 }
 
 Aws::String CurlInfoTypeToString(curl_infotype type)

diff --git a/src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp b/src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp
@@ -131,10 +131,20 @@ namespace Aws
         AmazonWebServiceResult<Aws::String> AWSHttpResourceClient::GetResourceWithAWSWebServiceResult(const std::shared_ptr<HttpRequest> &httpRequest) const
         {
             AWS_LOGSTREAM_TRACE(m_logtag.c_str(), "Retrieving credentials from " << httpRequest->GetURIString());
+            if (!m_httpClient)
+            {
+                AWS_LOGSTREAM_FATAL(m_logtag.c_str(), "Unable to get a response: missing http client!");
+                return {{}, {}, HttpResponseCode::REQUEST_NOT_MADE};
+            }
 
             for (long retries = 0;; retries++)
             {
                 std::shared_ptr<HttpResponse> response(m_httpClient->MakeRequest(httpRequest));
+                if (!response)
+                {
+                    AWS_LOGSTREAM_FATAL(m_logtag.c_str(), "Unable to get a response: http client returned a nullptr!");
+                    return {{}, {}, HttpResponseCode::NO_RESPONSE};
+                }
 
                 if (response->GetResponseCode() == HttpResponseCode::OK)
                 {