From 81a91fbcbb374b666e1079fe4e0f8b169fa8b326 Mon Sep 17 00:00:00 2001 From: lioncash Date: Thu, 30 May 2013 11:47:10 -0400 Subject: [PATCH] Ensure code inside method __KernelSwitchContext in sceKernelThread.cpp isn't unintentionally executed. The null check around line 2935 for target also makes me think this was supposed to have been done. --- Core/HLE/sceKernelThread.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index b705b8e238..f7568f16ec 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -2957,9 +2957,12 @@ void __KernelSwitchContext(Thread *target, const char *reason) oldUID, oldPC, currentThread, currentMIPS->pc); } - // No longer waiting. - target->nt.waitType = WAITTYPE_NONE; - target->nt.waitID = 0; + if (target) + { + // No longer waiting. + target->nt.waitType = WAITTYPE_NONE; + target->nt.waitID = 0; + } __KernelExecutePendingMipsCalls(target, true); }