Skip to content

Commit bcf9a14

Browse files
committed
1 parent c9e02d5 commit bcf9a14

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

libs/network/src/Socket.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,16 +832,27 @@ SOCKET Socket::GetSocket() const
832832
std::string Socket::IpToString(const sockaddr* addr)
833833
{
834834
std::array<char, 256> temp{};
835-
address_t addrCopy{};
835+
address_t addrCopy;
836+
837+
// a union is not initialized with zero
838+
std::memset(&addrCopy, 0, sizeof(addrCopy));
839+
836840
size_t size;
837841
if(addr->sa_family == AF_INET)
838842
{
839843
size = sizeof(sockaddr_in);
840844
std::memcpy(&addrCopy.sa_in, addr, size);
841-
} else
845+
846+
// set port to zero
847+
addrCopy.sa_in.sin_port = 0;
848+
}
849+
else
842850
{
843851
size = sizeof(sockaddr_in6);
844852
std::memcpy(&addrCopy.sa_in6, addr, size);
853+
854+
// set port to zero
855+
addrCopy.sa_in6.sin6_port = 0;
845856
}
846857

847858
#ifdef _WIN32

0 commit comments

Comments
 (0)