ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RetroAchievements Login Crash 

Fixing a bug with the RetroAchievements integration where certain combinations of configurations would result in a malformed API request and an attempt to dereference the null response.
This commit is contained in:
LillyJadeKatrin 2023-05-28 20:51:49 -04:00
parent 4dc4b28db4
commit 82ff6fb0b7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/AchievementManager.cpp
View File

@ -340,9 +340,11 @@ AchievementManager::ResponseType AchievementManager::VerifyCredentials(const std
.username = username.c_str(), .api_token = api_token.c_str(), .password = password.c_str()}; .username = username.c_str(), .api_token = api_token.c_str(), .password = password.c_str()};
ResponseType r_type = Request<rc_api_login_request_t, rc_api_login_response_t>( ResponseType r_type = Request<rc_api_login_request_t, rc_api_login_response_t>(
login_request, &login_data, rc_api_init_login_request, rc_api_process_login_response); login_request, &login_data, rc_api_init_login_request, rc_api_process_login_response);
m_display_name = login_data.display_name;
if (r_type == ResponseType::SUCCESS) if (r_type == ResponseType::SUCCESS)
{
Config::SetBaseOrCurrent(Config::RA_API_TOKEN, login_data.api_token); Config::SetBaseOrCurrent(Config::RA_API_TOKEN, login_data.api_token);
m_display_name = login_data.display_name;
}
rc_api_destroy_login_response(&login_data); rc_api_destroy_login_response(&login_data);
return r_type; return r_type;
} }
@ -648,8 +650,7 @@ AchievementManager::ResponseType AchievementManager::Request(
{ {
rc_api_request_t api_request; rc_api_request_t api_request;
Common::HttpRequest http_request; Common::HttpRequest http_request;
init_request(&api_request, &rc_request); if (init_request(&api_request, &rc_request) != RC_OK || !api_request.post_data)
if (!api_request.post_data)
return ResponseType::INVALID_REQUEST; return ResponseType::INVALID_REQUEST;
auto http_response = http_request.Post(api_request.url, api_request.post_data); auto http_response = http_request.Post(api_request.url, api_request.post_data);
rc_api_destroy_request(&api_request); rc_api_destroy_request(&api_request);