Fix logger related crash when HTTP response is empty. #9202
+10
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BhaaLseN
approved these changes
Oct 27, 2020
lioncash
reviewed
Oct 27, 2020
Source/Core/Common/HttpRequest.cpp
Outdated
| @@ -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.size() != 0) | |||
There was a problem hiding this comment.
this can be inverted and changed into the more concise if (buffer.empty())
|
Commit message should probably match the PR title as well. |
|
That should do it |
leoetlino
force-pushed
the
patch-http-requests
branch
from
aedd484
to
72e1131
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Fixes a regression introduced by #9187 where Dolphin would crash to desktop in the event the HTTP server returned a zero-length error response, which the update server appears to do occasionally.
The exception in question seems intentional in the logger so I've added a case to make sure there is response body before trying to log it.
EDIT: This crash can also happen when GameTDB doesn't have covers for a game in your library and Dolphin attempts to download it.