Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hle: kernel: svc: ConnectToNamedPort: Use KHandleTable::Reserve.

Browse source
This commit is contained in:
bunnei 2021-04-24 02:54:16 -07:00
parent 4b03e6e776
commit 7866eb03bb
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/hle/kernel/svc.cpp
View file

@ -291,8 +291,7 @@ static ResultCode UnmapMemory32(Core::System& system, u32 dst_addr, u32 src_addr
} }
/// Connect to an OS service given the port name, returns the handle to the port to out /// Connect to an OS service given the port name, returns the handle to the port to out
static ResultCode ConnectToNamedPort(Core::System& system, Handle* out_handle, static ResultCode ConnectToNamedPort(Core::System& system, Handle* out, VAddr port_name_address) {
VAddr port_name_address) {
auto& memory = system.Memory(); auto& memory = system.Memory();
if (!memory.IsValidVirtualAddress(port_name_address)) { if (!memory.IsValidVirtualAddress(port_name_address)) {
LOG_ERROR(Kernel_SVC, LOG_ERROR(Kernel_SVC,
@ -324,15 +323,21 @@ static ResultCode ConnectToNamedPort(Core::System& system, Handle* out_handle,
} }
auto port = it->second; auto port = it->second;
// Reserve a handle for the port.
// NOTE: Nintendo really does write directly to the output handle here.
R_TRY(handle_table.Reserve(out));
auto handle_guard = SCOPE_GUARD({ handle_table.Unreserve(*out); });
// Create a session. // Create a session.
KClientSession* session{}; KClientSession* session{};
R_TRY(port->CreateSession(std::addressof(session))); R_TRY(port->CreateSession(std::addressof(session)));
// Register the session in the table, close the extra reference. // Register the session in the table, close the extra reference.
handle_table.Add(out_handle, session); handle_table.Register(*out, session);
session->Close(); session->Close();
// We succeeded. // We succeeded.
handle_guard.Cancel();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }