Emulation/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-06-02 19:28:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12754 from LillyJadeKatrin/retroachievements-possiblememoryleakfix

Browse source 
Fix possible memory leak in an Achievement Manager callback
This commit is contained in:
Admiral H. Curtiss 2024-05-03 17:10:04 +02:00 committed by GitHub
parent 5817be7bd3 fc64b43fae
commit 42583deea7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/Core/AchievementManager.cpp
View file

@ -15,6 +15,7 @@
#include "Common/Image.h" #include "Common/Image.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h"
#include "Common/WorkQueueThread.h" #include "Common/WorkQueueThread.h"
#include "Core/Config/AchievementSettings.h" #include "Core/Config/AchievementSettings.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -564,15 +565,16 @@ void AchievementManager::LeaderboardEntriesCallback(int result, const char* erro
rc_client_leaderboard_entry_list_t* list, rc_client_leaderboard_entry_list_t* list,
rc_client_t* client, void* userdata) rc_client_t* client, void* userdata)
{ {
u32* leaderboard_id = reinterpret_cast<u32*>(userdata);
Common::ScopeGuard on_end_scope([&]() { delete leaderboard_id; });
if (result != RC_OK) if (result != RC_OK)
{ {
WARN_LOG_FMT(ACHIEVEMENTS, "Failed to fetch leaderboard entries."); WARN_LOG_FMT(ACHIEVEMENTS, "Failed to fetch leaderboard entries.");
return; return;
} }
u32 leaderboard_id = *reinterpret_cast<u32*>(userdata); auto& leaderboard = AchievementManager::GetInstance().m_leaderboard_map[*leaderboard_id];
delete userdata;
auto& leaderboard = AchievementManager::GetInstance().m_leaderboard_map[leaderboard_id];
for (size_t ix = 0; ix < list->num_entries; ix++) for (size_t ix = 0; ix < list->num_entries; ix++)
{ {
std::lock_guard lg{AchievementManager::GetInstance().GetLock()}; std::lock_guard lg{AchievementManager::GetInstance().GetLock()};
@ -582,7 +584,7 @@ void AchievementManager::LeaderboardEntriesCallback(int result, const char* erro
memcpy(map_entry.score.data(), response_entry.display, FORMAT_SIZE); memcpy(map_entry.score.data(), response_entry.display, FORMAT_SIZE);
map_entry.rank = response_entry.rank; map_entry.rank = response_entry.rank;
} }
AchievementManager::GetInstance().m_update_callback({.leaderboards = {leaderboard_id}}); AchievementManager::GetInstance().m_update_callback({.leaderboards = {*leaderboard_id}});
} }
void AchievementManager::LoadGameCallback(int result, const char* error_message, void AchievementManager::LoadGameCallback(int result, const char* error_message,