status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minissdpc.c: avoid unix socket leak in getDevicesFromMiniSSDPD()

This commit is contained in:
Thomas Bernard 2015-08-27 10:03:22 +02:00
parent aba8c3f3d7
commit cdccc0290d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniupnpc/Changelog.txt
View File

@ -1,6 +1,9 @@
$Id: Changelog.txt,v 1.212 2015/07/23 20:41:50 nanard Exp $ $Id: Changelog.txt,v 1.212 2015/07/23 20:41:50 nanard Exp $
miniUPnP client Changelog. miniUPnP client Changelog.
2015/08/27:
avoid unix socket leak in getDevicesFromMiniSSDPD()
2015/08/16: 2015/08/16:
Also accept "Up" as ConnectionStatus value Also accept "Up" as ConnectionStatus value

7
miniupnpc/minissdpc.c
View File

@ -44,7 +44,7 @@ struct sockaddr_un {
struct UPNPDev * struct UPNPDev *
getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath, int * error) getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath, int * error)
{ {
struct UPNPDev * devlist; struct UPNPDev * devlist = NULL;
int s; int s;
int res; int res;
@ -58,9 +58,9 @@ getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath, int * err
if (res < 0) { if (res < 0) {
if (error) if (error)
*error = res; *error = res;
return NULL; } else {
devlist = receiveDevicesFromMiniSSDPD(s, error);
} }
devlist = receiveDevicesFromMiniSSDPD(s, error);
disconnectFromMiniSSDPD(s); disconnectFromMiniSSDPD(s);
return devlist; return devlist;
} }
@ -145,6 +145,7 @@ connectToMiniSSDPD(const char * socketpath)
if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
{ {
/*syslog(LOG_WARNING, "connect(\"%s\"): %m", socketpath);*/ /*syslog(LOG_WARNING, "connect(\"%s\"): %m", socketpath);*/
close(s);
return MINISSDPC_SOCKET_ERROR; return MINISSDPC_SOCKET_ERROR;
} }
return s; return s;