From b3a7e29bac65bbb57ee9de45e5f7e1ca1cb49cf7 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 26 Dec 2014 19:32:28 +0000 Subject: [PATCH] - Use sizeof(struct in_addr) instead of res->ai_addrlen git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5169 82007160-df01-0410-b94d-b575c5fd34c7 --- src/irc.c | 2 +- src/negcache.c | 2 +- src/scan.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/irc.c b/src/irc.c index 3085148..f91b650 100644 --- a/src/irc.c +++ b/src/irc.c @@ -273,7 +273,7 @@ irc_init(void) exit(EXIT_FAILURE); } - memcpy(&IRC_LOCAL.in4.s_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, res->ai_addrlen); + memcpy(&IRC_LOCAL.in4.s_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr)); freeaddrinfo(res); bsaddr.sa4.sin_addr.s_addr = IRC_LOCAL.in4.s_addr; diff --git a/src/negcache.c b/src/negcache.c index 9f8dd91..8335807 100644 --- a/src/negcache.c +++ b/src/negcache.c @@ -228,7 +228,7 @@ void negcache_insert(const char *ipstr) return; } - memcpy(&ip.sa4.sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, res->ai_addrlen); + memcpy(&ip.sa4.sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr)); freeaddrinfo(res); n = nc_insert(nc_head, ip.sa4.sin_addr.s_addr); diff --git a/src/scan.c b/src/scan.c index 452cfbf..701c005 100644 --- a/src/scan.c +++ b/src/scan.c @@ -359,7 +359,7 @@ scan_connect(char **user, char *msg) } else { - memcpy(&ip.sa4.sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, res->ai_addrlen); + memcpy(&ip.sa4.sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr)); freeaddrinfo(res); if (check_neg_cache(ip.sa4.sin_addr.s_addr)) -- 2.30.2