diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 682551616..4c72dab3e 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -545,11 +545,10 @@ void SOC_U::SendTo(Kernel::HLERequestContext& ctx) { auto input_buff = rp.PopStaticBuffer(); auto dest_addr_buff = rp.PopStaticBuffer(); - CTRSockAddr ctr_dest_addr; - std::memcpy(&ctr_dest_addr, dest_addr_buff.data(), sizeof(ctr_dest_addr)); - s32 ret = -1; if (addr_len > 0) { + CTRSockAddr ctr_dest_addr; + std::memcpy(&ctr_dest_addr, dest_addr_buff.data(), sizeof(ctr_dest_addr)); sockaddr dest_addr = CTRSockAddr::ToPlatform(ctr_dest_addr); ret = ::sendto(socket_handle, reinterpret_cast(input_buff.data()), len, flags, &dest_addr, sizeof(dest_addr)); @@ -624,12 +623,20 @@ void SOC_U::RecvFrom(Kernel::HLERequestContext& ctx) { std::vector addr_buff(sizeof(ctr_src_addr)); sockaddr src_addr; socklen_t src_addr_len = sizeof(src_addr); - s32 ret = ::recvfrom(socket_handle, reinterpret_cast(output_buff.data()), len, flags, - &src_addr, &src_addr_len); - if (ret >= 0 && src_addr_len > 0) { - ctr_src_addr = CTRSockAddr::FromPlatform(src_addr); - std::memcpy(addr_buff.data(), &ctr_src_addr, sizeof(ctr_src_addr)); + s32 ret = -1; + if (addr_len > 0) { + // Only get src adr if input adr available + ret = ::recvfrom(socket_handle, reinterpret_cast(output_buff.data()), len, flags, + &src_addr, &src_addr_len); + if (ret >= 0 && src_addr_len > 0) { + ctr_src_addr = CTRSockAddr::FromPlatform(src_addr); + std::memcpy(addr_buff.data(), &ctr_src_addr, sizeof(ctr_src_addr)); + } + } else { + ret = ::recvfrom(socket_handle, reinterpret_cast(output_buff.data()), len, flags, + NULL, 0); + addr_buff.resize(0); } s32 total_received = ret;