mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-28 16:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TraversalClient: Prevent uninitialized values from occurring in MakeENetAddress

Browse Source 
Previously, eaddr would only be partially initialized in the ipv6 case.
Even if there's no support for it, we may as well ensure that the
variable always has deterministic initialization.

While we're at it, we can make the parameter a const reference, given no
members are modified.
This commit is contained in:
Lioncash 2021-01-19 14:21:04 -05:00
parent f0c6e696fd
commit cb4ca7837a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/TraversalClient.cpp
View File

@ -58,17 +58,17 @@ void TraversalClient::ReconnectToServer()
m_Client->OnTraversalStateChanged(); m_Client->OnTraversalStateChanged();
} }
static ENetAddress MakeENetAddress(TraversalInetAddress* address) static ENetAddress MakeENetAddress(const TraversalInetAddress& address)
{ {
ENetAddress eaddr; ENetAddress eaddr{};
if (address->isIPV6) if (address.isIPV6)
{ {
eaddr.port = 0; // no support yet :( eaddr.port = 0; // no support yet :(
} }
else else
{ {
eaddr.host = address->address[0]; eaddr.host = address.address[0];
eaddr.port = ntohs(address->port); eaddr.port = ntohs(address.port);
} }
return eaddr; return eaddr;
} }
@ -160,7 +160,7 @@ void TraversalClient::HandleServerPacket(TraversalPacket* packet)
case TraversalPacketType::PleaseSendPacket: case TraversalPacketType::PleaseSendPacket:
{ {
// security is overrated. // security is overrated.
ENetAddress addr = MakeENetAddress(&packet->pleaseSendPacket.address); ENetAddress addr = MakeENetAddress(packet->pleaseSendPacket.address);
if (addr.port != 0) if (addr.port != 0)
{ {
char message[] = "Hello from Dolphin Netplay..."; char message[] = "Hello from Dolphin Netplay...";
@ -188,7 +188,7 @@ void TraversalClient::HandleServerPacket(TraversalPacket* packet)
break; break;
if (packet->type == TraversalPacketType::ConnectReady) if (packet->type == TraversalPacketType::ConnectReady)
m_Client->OnConnectReady(MakeENetAddress(&packet->connectReady.address)); m_Client->OnConnectReady(MakeENetAddress(packet->connectReady.address));
else else
m_Client->OnConnectFailed(packet->connectFailed.reason); m_Client->OnConnectFailed(packet->connectFailed.reason);
break; break;