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 #3721 from lioncash/net 

NetPlayServer: Get rid of some explicit deallocations
This commit is contained in:
Pierre Bourdon 2016-03-09 15:29:44 +01:00
parent 1c7f5b139d 84b0a930da
commit a06eaabcdc
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -918,10 +918,11 @@ bool NetPlayServer::initUPnP()
memset(&m_upnp_data, 0, sizeof(IGDdatas)); memset(&m_upnp_data, 0, sizeof(IGDdatas));
// Find all UPnP devices // Find all UPnP devices
std::unique_ptr<UPNPDev, decltype(&freeUPNPDevlist)> devlist(nullptr, freeUPNPDevlist);
#if MINIUPNPC_API_VERSION >= 14 #if MINIUPNPC_API_VERSION >= 14
UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror); devlist.reset(upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror));
#else #else
UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror); devlist.reset(upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror));
#endif #endif
if (!devlist) if (!devlist)
{ {
@ -934,7 +935,7 @@ bool NetPlayServer::initUPnP()
} }
// Look for the IGD // Look for the IGD
for (UPNPDev* dev = devlist; dev; dev = dev->pNext) for (UPNPDev* dev = devlist.get(); dev; dev = dev->pNext)
{ {
if (strstr(dev->st, "InternetGatewayDevice")) if (strstr(dev->st, "InternetGatewayDevice"))
igds.push_back(dev); igds.push_back(dev);
@ -942,18 +943,16 @@ bool NetPlayServer::initUPnP()
for (const UPNPDev* dev : igds) for (const UPNPDev* dev : igds)
{ {
char* descXML; std::unique_ptr<char, decltype(&std::free)> descXML(nullptr, std::free);
int statusCode = 200; int statusCode = 200;
#if MINIUPNPC_API_VERSION >= 16 #if MINIUPNPC_API_VERSION >= 16
descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0, &statusCode); descXML.reset(static_cast<char*>(miniwget(dev->descURL, &descXMLsize, 0, &statusCode)));
#else #else
descXML = (char*)miniwget(dev->descURL, &descXMLsize, 0); descXML.reset(static_cast<char*>(miniwget(dev->descURL, &descXMLsize, 0)));
#endif #endif
if (descXML && (statusCode == 200)) if (descXML && statusCode == 200)
{ {
parserootdesc(descXML, descXMLsize, &m_upnp_data); parserootdesc(descXML.get(), descXMLsize, &m_upnp_data);
free(descXML);
descXML = nullptr;
GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0); GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL); NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
@ -961,17 +960,10 @@ 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);
} }
} }
freeUPNPDevlist(devlist);
return true; return true;
} }