9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Don't read beyond the bounds of ServerInfo.ip and ServerInfo.ip6.

Browse source
This commit is contained in:
Jilles Tjoelker 2014-09-21 16:56:49 +02:00
parent dc336d1a63
commit 5f1db61bdf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/s_serv.c
View file

@ -996,14 +996,14 @@ serv_connect_resolved(struct Client *client_p)
if(ServerConfVhosted(server_p)) if(ServerConfVhosted(server_p))
{ {
memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum)); memcpy(&myipnum, &server_p->my_ipnum, sizeof(server_p->my_ipnum));
((struct sockaddr_in *)&myipnum)->sin_port = 0; ((struct sockaddr_in *)&myipnum)->sin_port = 0;
myipnum.ss_family = server_p->aftype; myipnum.ss_family = server_p->aftype;
} }
else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost) else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
{ {
memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum)); memcpy(&myipnum, &ServerInfo.ip, sizeof(ServerInfo.ip));
((struct sockaddr_in *)&myipnum)->sin_port = 0; ((struct sockaddr_in *)&myipnum)->sin_port = 0;
myipnum.ss_family = AF_INET; myipnum.ss_family = AF_INET;
SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in)); SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
@ -1012,7 +1012,7 @@ serv_connect_resolved(struct Client *client_p)
#ifdef RB_IPV6 #ifdef RB_IPV6
else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost) else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
{ {
memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum)); memcpy(&myipnum, &ServerInfo.ip6, sizeof(ServerInfo.ip6));
((struct sockaddr_in6 *)&myipnum)->sin6_port = 0; ((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
myipnum.ss_family = AF_INET6; myipnum.ss_family = AF_INET6;
SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6)); SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6));