emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't call freeaddinfo(NULL)

Browse Source 
Signed-off-by: Vitaly Magerya <vmagerya@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Vitaly Magerya
2011-03-22 20:14:26 +01:00
committed by Denys Vlasenko
parent cf9074b54b
commit 7f4b769c42
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libbb/inet_common.c
View File

@@ -164,17 +164,17 @@ char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t ne
int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
{
struct addrinfo req, *ai;
struct addrinfo req, *ai = NULL;
int s;
memset(&req, '\0', sizeof req);
memset(&req, 0, sizeof(req));
req.ai_family = AF_INET6;
s = getaddrinfo(name, NULL, &req, &ai);
if (s) {
if (s != 0) {
bb_error_msg("getaddrinfo: %s: %d", name, s);
return -1;
}
memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6));
memcpy(sin6, ai->ai_addr, sizeof(*sin6));
freeaddrinfo(ai);
return 0;
}
@@ -209,9 +209,11 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
return xstrdup("*");
}
s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
name, sizeof(name), NULL, 0, 0);
if (s) {
s = getnameinfo((struct sockaddr *) sin6, sizeof(*sin6),
name, sizeof(name),
/*serv,servlen:*/ NULL, 0,
0);
if (s != 0) {
bb_error_msg("getnameinfo failed");
return NULL;
}