diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-26 10:33:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 10:33:28 -0400 |
| commit | d3da1e6517fe27670b6c2d713d144872d55057d8 (patch) | |
| tree | ab5c72b17b15185ec40945c5ba29400569b50630 /src/core/hle/kernel/k_scheduler.cpp | |
| parent | 6ffcc3d5d2aac8e095aed138d4113a384a35f50e (diff) | |
| parent | d7c532d8894ce806c9af13b8dd3eec975642b348 (diff) | |
Merge pull request #10990 from comex/ubsan
Fixes and workarounds to make UBSan happier on macOS
Diffstat (limited to 'src/core/hle/kernel/k_scheduler.cpp')
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index 75ce5a23c..d8143c650 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -510,11 +510,12 @@ void KScheduler::Unload(KThread* thread) { void KScheduler::Reload(KThread* thread) { auto& cpu_core = m_kernel.System().ArmInterface(m_core_id); + auto* process = thread->GetOwnerProcess(); cpu_core.LoadContext(thread->GetContext32()); cpu_core.LoadContext(thread->GetContext64()); cpu_core.SetTlsAddress(GetInteger(thread->GetTlsAddress())); cpu_core.SetTPIDR_EL0(thread->GetTpidrEl0()); - cpu_core.LoadWatchpointArray(thread->GetOwnerProcess()->GetWatchpoints()); + cpu_core.LoadWatchpointArray(process ? &process->GetWatchpoints() : nullptr); cpu_core.ClearExclusiveState(); } |