aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-03-18 18:06:13 -0700
committerGitHub <noreply@github.com>2022-03-18 18:06:13 -0700
commit4fb93cbb3fccda4a2f4d59151dd2781c6c0502de (patch)
tree4d0af42c15f7942a9d7f6481f3f05c4edd2b9068 /src/core
parentae3c4eb7f281beec13d96d7411d6a561ca9f1172 (diff)
parentbbf69903e93db3eecafa1086093f46404635eb87 (diff)
Merge pull request #8028 from v1993/patch-9
bsd: Allow inexact match for address length in AcceptImpl
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/sockets/bsd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index f83272633d..3dbac5a23e 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -569,9 +569,9 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
new_descriptor.socket = std::move(result.socket);
new_descriptor.is_connection_based = descriptor.is_connection_based;
- ASSERT(write_buffer.size() == sizeof(SockAddrIn));
const SockAddrIn guest_addr_in = Translate(result.sockaddr_in);
- std::memcpy(write_buffer.data(), &guest_addr_in, sizeof(guest_addr_in));
+ const size_t length = std::min(sizeof(guest_addr_in), write_buffer.size());
+ std::memcpy(write_buffer.data(), &guest_addr_in, length);
return {new_fd, Errno::SUCCESS};
}