PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Fix a dormant use-after-free bug in the breakpoint model

Browse Source
This commit is contained in:
chaoticgd
2025-09-25 03:16:49 +02:00
committed by lightningterror
parent 88d378d293
commit b5a2fe3223
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2-qt/Debugger/Breakpoints/BreakpointModel.cpp
+13 -7
View File
@@ -12,6 +12,7 @@
#include "DebugTools/DisassemblyManager.h"
#include "common/Console.h"
#include <QtCore/QPointer>
#include <QtWidgets/QMessageBox>
#include <algorithm>
@@ -538,15 +539,20 @@ bool BreakpointModel::insertBreakpointRows(int row, int count, std::vector<Break
void BreakpointModel::refreshData()
{
Host::RunOnCPUThread([this]() mutable {
const QPointer<BreakpointModel> model(this);
const BreakPointCpu cpu_type = m_cpu.getCpuType();
Host::RunOnCPUThread([model, cpu_type]() mutable {
std::vector<BreakpointMemcheck> all_breakpoints;
std::ranges::move(CBreakPoints::GetBreakpoints(m_cpu.getCpuType(), false), std::back_inserter(all_breakpoints));
std::ranges::move(CBreakPoints::GetMemChecks(m_cpu.getCpuType()), std::back_inserter(all_breakpoints));
std::ranges::move(CBreakPoints::GetBreakpoints(cpu_type, false), std::back_inserter(all_breakpoints));
std::ranges::move(CBreakPoints::GetMemChecks(cpu_type), std::back_inserter(all_breakpoints));
QtHost::RunOnUIThread([this, breakpoints = std::move(all_breakpoints)]() mutable {
beginResetModel();
m_breakpoints = std::move(breakpoints);
endResetModel();
QtHost::RunOnUIThread([model, breakpoints = std::move(all_breakpoints)]() mutable {
if (!model)
return;
model->beginResetModel();
model->m_breakpoints = std::move(breakpoints);
model->endResetModel();
});
});
}