summaryrefslogtreecommitdiff
path: root/src/common/fiber.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2022-01-14 16:17:19 -0800
committerGravatar bunnei2022-01-14 16:17:19 -0800
commitf6de57c1a52b2170e820f092729e289a8d0ec0c0 (patch)
tree01f52e6791cdbb68cacdd1ffb5177db7f24b33fb /src/common/fiber.cpp
parentMerge pull request #7699 from bunnei/fix-service-thread-race (diff)
downloadyuzu-f6de57c1a52b2170e820f092729e289a8d0ec0c0.tar.gz
yuzu-f6de57c1a52b2170e820f092729e289a8d0ec0c0.tar.xz
yuzu-f6de57c1a52b2170e820f092729e289a8d0ec0c0.zip
common: fiber: YieldTo: Avoid hard crash on nullptr previous_fiber.
- When the emulator crashes to desktop below, we don't even get this captured in a log, making such issues harder to debug.
Diffstat (limited to 'src/common/fiber.cpp')
-rw-r--r--src/common/fiber.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp
index 62010d762..81b212e4b 100644
--- a/src/common/fiber.cpp
+++ b/src/common/fiber.cpp
@@ -124,7 +124,10 @@ void Fiber::YieldTo(std::weak_ptr<Fiber> weak_from, Fiber& to) {
124 124
125 // "from" might no longer be valid if the thread was killed 125 // "from" might no longer be valid if the thread was killed
126 if (auto from = weak_from.lock()) { 126 if (auto from = weak_from.lock()) {
127 ASSERT(from->impl->previous_fiber != nullptr); 127 if (from->impl->previous_fiber == nullptr) {
128 ASSERT_MSG(false, "previous_fiber is nullptr!");
129 return;
130 }
128 from->impl->previous_fiber->impl->context = transfer.fctx; 131 from->impl->previous_fiber->impl->context = transfer.fctx;
129 from->impl->previous_fiber->impl->guard.unlock(); 132 from->impl->previous_fiber->impl->guard.unlock();
130 from->impl->previous_fiber.reset(); 133 from->impl->previous_fiber.reset();