From ec5674a6ad89ec705e835d2b711dca18f4ef1616 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 9 Jun 2021 22:29:18 -0700 Subject: hle: service: sm: Fix GetService setup of session & port. --- src/core/hle/kernel/k_client_port.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/kernel/k_client_port.cpp') diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 50606bd91..bcb884e8a 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -66,7 +66,7 @@ ResultCode KClientPort::CreateSession(KClientSession** out, // Update the session counts. { // Atomically increment the number of sessions. - s32 new_sessions; + s32 new_sessions{}; { const auto max = max_sessions; auto cur_sessions = num_sessions.load(std::memory_order_acquire); -- cgit v1.2.3 From b259e95c09f231571c6a1c66046ff859019b1733 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 9 Jun 2021 22:36:42 -0700 Subject: hle: kernel: KClientPort: Add an assert for session count. - Prevents us from over decrementing num_sessions. --- src/core/hle/kernel/k_client_port.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/core/hle/kernel/k_client_port.cpp') diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index bcb884e8a..ef168fe87 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp @@ -28,6 +28,9 @@ void KClientPort::Initialize(KPort* parent_port_, s32 max_sessions_, std::string void KClientPort::OnSessionFinalized() { KScopedSchedulerLock sl{kernel}; + // This might happen if a session was improperly used with this port. + ASSERT_MSG(num_sessions > 0, "num_sessions is invalid"); + const auto prev = num_sessions--; if (prev == max_sessions) { this->NotifyAvailable(); -- cgit v1.2.3