From ba4c1c5947b1594897d05f95da8e89ff8843c868 Mon Sep 17 00:00:00 2001 From: spycrab Date: Thu, 20 Jun 2019 19:44:51 +0200 Subject: [PATCH] Common/HttpRequest: Use CURLOPT_ERRORBUFFER for error messages --- Source/Core/Common/HttpRequest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp index 8929185a86ee..b26a120b3244 100644 --- a/Source/Core/Common/HttpRequest.cpp +++ b/Source/Core/Common/HttpRequest.cpp @@ -42,6 +42,7 @@ class HttpRequest::Impl final static inline std::once_flag s_curl_was_initialized; ProgressCallback m_callback; std::unique_ptr m_curl{nullptr, curl_easy_cleanup}; + std::string m_error_string; }; HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms, ProgressCallback callback) @@ -119,6 +120,10 @@ HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback c curl_easy_setopt(m_curl.get(), CURLOPT_PROGRESSFUNCTION, CurlProgressCallback); } + // Set up error buffer + m_error_string.resize(CURL_ERROR_SIZE); + curl_easy_setopt(m_curl.get(), CURLOPT_ERRORBUFFER, m_error_string.data()); + // libcurl may not have been built with async DNS support, so we disable // signal handlers to avoid a possible and likely crash if a resolve times out. curl_easy_setopt(m_curl.get(), CURLOPT_NOSIGNAL, true); @@ -205,7 +210,7 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me const CURLcode res = curl_easy_perform(m_curl.get()); if (res != CURLE_OK) { - ERROR_LOG(COMMON, "Failed to %s %s: %s", type, url.c_str(), curl_easy_strerror(res)); + ERROR_LOG(COMMON, "Failed to %s %s: %s", type, url.c_str(), m_error_string.c_str()); return {}; }