summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Valeri2022-03-15 14:06:34 +0300
committerGravatar GitHub2022-03-15 14:06:34 +0300
commit9e633999d6ffb64c9c21ac7f4b9be565fdec8e05 (patch)
treebc5170826b004f867b884aab186b9089ff177500
parentMerge pull request #8006 from BytesGalore/fix_cmake_missing_qt5_dbus (diff)
downloadyuzu-9e633999d6ffb64c9c21ac7f4b9be565fdec8e05.tar.gz
yuzu-9e633999d6ffb64c9c21ac7f4b9be565fdec8e05.tar.xz
yuzu-9e633999d6ffb64c9c21ac7f4b9be565fdec8e05.zip
bsd: Allow inexact match for address length in AcceptImpl
Minecraft passes in zero for length, but this should account for all possible cases
-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}