- 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

diff --git a/src/irc.c b/src/irc.c
index 3085148dc1c3dc322c38fcd731636a6e0e6503bb..f91b65079c5ac1aa96a0c85b65e0058d441786b9 100644 (file)
--- 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 9f8dd9147219ecfa04462a2c3f421191ac314e65..833580743f3f9f87291855de874ad8215d47fd0c 100644 (file)
--- 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 452cfbfb53c69a6c52e7d040e22e2e368f28be4e..701c005ffa9ea540f4ff9883912037cabd279fd3 100644 (file)
--- 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))