aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2014-12-29 18:34:01 -0200
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-01-09 04:02:28 -0200
commit78ea76e12f22495b3b726a19147b60b2eaf50a9d (patch)
treebf2e87982cb365c752ac0c7c4b0b8cc857ff38ad /src/core/hle/kernel/thread.cpp
parent7f1557fbbdd64784371f8299bce347c319004675 (diff)
Thread: Fix nullptr access in a logging function
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 16ceb7ac..0ae1a21d 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -420,7 +420,8 @@ void Reschedule() {
for (Thread* thread : thread_list) {
LOG_TRACE(Kernel, "\thandle=0x%08X prio=0x%02X, status=0x%08X wait_type=0x%08X wait_handle=0x%08X",
- thread->GetHandle(), thread->current_priority, thread->status, thread->wait_type, thread->wait_object->GetHandle());
+ thread->GetHandle(), thread->current_priority, thread->status, thread->wait_type,
+ (thread->wait_object ? thread->wait_object->GetHandle() : INVALID_HANDLE));
}
}
}