Merge pull request #509 from devnexen/network_unix_chg_proposals

unix network little change proposals/few possible leaks fixes
This commit is contained in:
Yamagi 2020-01-28 15:33:31 +01:00 committed by GitHub
commit 3354252161
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -417,13 +417,8 @@ NET_StringToSockaddr(const char *s, struct sockaddr_storage *sadr)
switch (resultp->ai_family)
{
case AF_INET:
/* convert to ipv4 addr */
memset(sadr, 0, sizeof(struct sockaddr_storage));
memcpy(sadr, resultp->ai_addr, resultp->ai_addrlen);
break;
case AF_INET6:
/* convert to ipv6 addr */
/* convert to ipv4/ipv6 addr */
memset(sadr, 0, sizeof(struct sockaddr_storage));
memcpy(sadr, resultp->ai_addr, resultp->ai_addrlen);
break;
@ -875,6 +870,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family)
{
Com_Printf("ERROR: NET_Socket: setsockopt SO_BROADCAST:%s\n",
NET_ErrorString());
freeaddrinfo(res);
return 0;
}
}
@ -885,6 +881,7 @@ NET_Socket(char *net_interface, int port, netsrc_t type, int family)
{
Com_Printf("ERROR: NET_Socket: setsockopt SO_REUSEADDR:%s\n",
NET_ErrorString());
freeaddrinfo(res);
return 0;
}