summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2022-03-18 18:06:13 -0700
committerGravatar GitHub2022-03-18 18:06:13 -0700
commit8c8b5359f291fd78d5e3028c4287daf7230227e7 (patch)
tree4d0af42c15f7942a9d7f6481f3f05c4edd2b9068
parentMerge pull request #8039 from ameerj/core-include (diff)
parentbsd: Allow inexact match for address length in AcceptImpl (diff)
downloadyuzu-8c8b5359f291fd78d5e3028c4287daf7230227e7.tar.gz
yuzu-8c8b5359f291fd78d5e3028c4287daf7230227e7.tar.xz
yuzu-8c8b5359f291fd78d5e3028c4287daf7230227e7.zip
Merge pull request #8028 from v1993/patch-9
bsd: Allow inexact match for address length in AcceptImpl
Diffstat (limited to '')
-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 f83272633..3dbac5a23 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) {
569 new_descriptor.socket = std::move(result.socket); 569 new_descriptor.socket = std::move(result.socket);
570 new_descriptor.is_connection_based = descriptor.is_connection_based; 570 new_descriptor.is_connection_based = descriptor.is_connection_based;
571 571
572 ASSERT(write_buffer.size() == sizeof(SockAddrIn));
573 const SockAddrIn guest_addr_in = Translate(result.sockaddr_in); 572 const SockAddrIn guest_addr_in = Translate(result.sockaddr_in);
574 std::memcpy(write_buffer.data(), &guest_addr_in, sizeof(guest_addr_in)); 573 const size_t length = std::min(sizeof(guest_addr_in), write_buffer.size());
574 std::memcpy(write_buffer.data(), &guest_addr_in, length);
575 575
576 return {new_fd, Errno::SUCCESS}; 576 return {new_fd, Errno::SUCCESS};
577} 577}