Browse Source

Merge pull request #6382 from lioncash/null

k_thread: Move dereference after null check in Initialize()
nce_cpp
bunnei 5 years ago
committed by GitHub
parent
commit
6864ccfee8
  1. 4
      src/core/hle/kernel/k_thread.cpp

4
src/core/hle/kernel/k_thread.cpp

@ -168,13 +168,13 @@ ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_s
std::memset(static_cast<void*>(std::addressof(GetStackParameters())), 0,
sizeof(StackParameters));
// Set parent, if relevant.
if (owner != nullptr) {
// Setup the TLS, if needed.
if (type == ThreadType::User) {
tls_address = owner->CreateTLSRegion();
}
// Set parent, if relevant.
if (owner != nullptr) {
parent = owner;
parent->Open();
parent->IncrementThreadCount();

Loading…
Cancel
Save