ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3610 from Aestek/fix/netplay-ifaddr-segfault 

Fix: segfault in NetPlayServer::GetInterfaceListInternal for ifa_addr-less interfaces
This commit is contained in:
Ryan Houdek 2016-02-08 16:27:50 -05:00
parent 08c9e3b7a4 b92a80ba1b
commit 32dcb4c37c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/NetPlayServer.cpp
View File

@ -828,6 +828,9 @@ std::vector<std::pair<std::string, std::string>> NetPlayServer::GetInterfaceList
for (ifaddrs* curifp = ifp; curifp; curifp = curifp->ifa_next) for (ifaddrs* curifp = ifp; curifp; curifp = curifp->ifa_next)
{ {
sockaddr* sa = curifp->ifa_addr; sockaddr* sa = curifp->ifa_addr;
if (sa == nullptr)
continue;
if (sa->sa_family != AF_INET) if (sa->sa_family != AF_INET)
continue; continue;
sockaddr_in* sai = (struct sockaddr_in*) sa; sockaddr_in* sai = (struct sockaddr_in*) sa;