fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Fixed yet another remote buffer overflow.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2337 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2006-06-30 15:45:16 +00:00
parent 285f6e6ca8
commit 997fa53005
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/common/net_wins.c
View file

@ -448,7 +448,7 @@ qboolean NET_StringToSockaddr (char *s, struct sockaddr_qstorage *sadr)
else else
#endif #endif
#ifdef IPPROTO_IPV6 #ifdef IPPROTO_IPV6
if (pgetaddrinfo) if (pgetaddrinfo)
{ {
struct addrinfo *addrinfo = NULL; struct addrinfo *addrinfo = NULL;
struct addrinfo *pos; struct addrinfo *pos;
@ -457,7 +457,7 @@ qboolean NET_StringToSockaddr (char *s, struct sockaddr_qstorage *sadr)
char *port; char *port;
char dupbase[256]; char dupbase[256];
int len; int len;
memset(&udp6hint, 0, sizeof(udp6hint)); memset(&udp6hint, 0, sizeof(udp6hint));
udp6hint.ai_family = 0;//Any... we check for AF_INET6 or 4 udp6hint.ai_family = 0;//Any... we check for AF_INET6 or 4
udp6hint.ai_socktype = SOCK_DGRAM; udp6hint.ai_socktype = SOCK_DGRAM;
@ -531,6 +531,9 @@ dblbreak:
((struct sockaddr_in *)sadr)->sin_port = 0; ((struct sockaddr_in *)sadr)->sin_port = 0;
if (strlen(s) >= sizeof(copy)-1)
return false;
strcpy (copy, s); strcpy (copy, s);
// strip off a trailing :port if present // strip off a trailing :port if present
for (colon = copy ; *colon ; colon++) for (colon = copy ; *colon ; colon++)