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

Fix build with MINIUPNPC_API_VERSION >= 16 

miniupnp commit c4991916e5c12a7754e935e71a5313e75af6aeb9 introduced a
4th statusCode parameter to miniwget function. This parameter is set
to a value returned by the UPnP device. We have to check if it's set
to 200 to make sure the result is a success. Also, we now have to check
if descXML is set in the error case and free it.
This commit is contained in:
İsmail Dönmez 2016-03-04 10:56:28 +02:00
parent e60f0b3cf0
commit 20f8b471a8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -942,8 +942,14 @@ bool NetPlayServer::initUPnP()
for (const UPNPDev* dev : igds) for (const UPNPDev* dev : igds)
{ {
char* descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0); char* descXML;
if (descXML) int statusCode = 200;
#if MINIUPNPC_API_VERSION >= 16
descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0, &statusCode);
#else
descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0);
#endif
if (descXML && (statusCode == 200))
{ {
parserootdesc(descXML, descXMLsize, &m_upnp_data); parserootdesc(descXML, descXMLsize, &m_upnp_data);
free(descXML); free(descXML);
@ -955,6 +961,11 @@ bool NetPlayServer::initUPnP()
} }
else else
{ {
if (descXML)
{
free(descXML);
descXML = nullptr;
}
WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL); WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL);
} }
} }