Merge pull request #9202 from WamWooWam/patch-http-requests

Fix logger related crash when HTTP response is empty.
dolphin-emu · Oct 29, 2020 · f665dda · f665dda
2 parents 650638c + 72e1131
commit f665dda
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp
@@ -221,8 +221,16 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
   curl_easy_getinfo(m_curl.get(), CURLINFO_RESPONSE_CODE, &response_code);
   if (response_code != 200)
   {
-    ERROR_LOG_FMT(COMMON, "Failed to {} {}: server replied with code {} and body\n\x1b[0m{:.{}}",
-                  type, url, response_code, buffer.data(), static_cast<int>(buffer.size()));
+    if (buffer.empty())
+    {
+      ERROR_LOG_FMT(COMMON, "Failed to {} {}: server replied with code {}", type, url,
+                    response_code);
+    }
+    else
+    {
+      ERROR_LOG_FMT(COMMON, "Failed to {} {}: server replied with code {} and body\n\x1b[0m{:.{}}",
+                    type, url, response_code, buffer.data(), static_cast<int>(buffer.size()));
+    }
     return {};
   }