mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-24 20:12:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MainWindow: Fix use-after-free during shutdown

Browse source 
Remove ConfigChangedCallback in MainWindow's destructor to prevent the
callback from accessing the destroyed MainWindow afterward.

After MainWindow is destroyed UICommon::Shutdown calls
LogManager::Shutdown which ultimately triggers any remaining callbacks.
This resulted in calling MainWindow::OnHardcoreChanged, which crashed in
debug builds and didn't have any obvious effect in release builds.
This commit is contained in:
Dentomologist 2025-04-24 11:36:18 -07:00
parent 805307f432
commit e37a195192
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -34,6 +34,7 @@
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#endif #endif
#include "Common/Config/Config.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Common/Version.h" #include "Common/Version.h"
#include "Common/WindowSystemInfo.h" #include "Common/WindowSystemInfo.h"
@ -277,7 +278,7 @@ MainWindow::MainWindow(Core::System& system, std::unique_ptr<BootParameters> boo
if (AchievementManager::GetInstance().IsHardcoreModeActive()) if (AchievementManager::GetInstance().IsHardcoreModeActive())
Settings::Instance().SetDebugModeEnabled(false); Settings::Instance().SetDebugModeEnabled(false);
// This needs to trigger on both RA_HARDCORE_ENABLED and RA_ENABLED // This needs to trigger on both RA_HARDCORE_ENABLED and RA_ENABLED
Config::AddConfigChangedCallback( m_config_changed_callback_id = Config::AddConfigChangedCallback(
[this]() { QueueOnObject(this, [this] { this->OnHardcoreChanged(); }); }); [this]() { QueueOnObject(this, [this] { this->OnHardcoreChanged(); }); });
// If hardcore is enabled when the emulator starts, make sure it turns off what it needs to // If hardcore is enabled when the emulator starts, make sure it turns off what it needs to
if (Config::Get(Config::RA_HARDCORE_ENABLED)) if (Config::Get(Config::RA_HARDCORE_ENABLED))
@ -351,6 +352,7 @@ MainWindow::~MainWindow()
Settings::Instance().ResetNetPlayServer(); Settings::Instance().ResetNetPlayServer();
#ifdef USE_RETRO_ACHIEVEMENTS #ifdef USE_RETRO_ACHIEVEMENTS
Config::RemoveConfigChangedCallback(m_config_changed_callback_id);
AchievementManager::GetInstance().Shutdown(); AchievementManager::GetInstance().Shutdown();
#endif // USE_RETRO_ACHIEVEMENTS #endif // USE_RETRO_ACHIEVEMENTS

5
Source/Core/DolphinQt/MainWindow.h
View file

@ -11,6 +11,10 @@
#include <optional> #include <optional>
#include <string> #include <string>
#ifdef USE_RETRO_ACHIEVEMENTS
#include "Common/Config/Config.h"
#endif // USE_RETRO_ACHIEVEMENTS
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
class QMenu; class QMenu;
@ -261,6 +265,7 @@ private:
#ifdef USE_RETRO_ACHIEVEMENTS #ifdef USE_RETRO_ACHIEVEMENTS
AchievementsWindow* m_achievements_window = nullptr; AchievementsWindow* m_achievements_window = nullptr;
Config::ConfigChangedCallbackID m_config_changed_callback_id;
#endif // USE_RETRO_ACHIEVEMENTS #endif // USE_RETRO_ACHIEVEMENTS
AssemblerWidget* m_assembler_widget; AssemblerWidget* m_assembler_widget;