Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix memory leak in ipaddr.c #103

Merged
merged 1 commit into from
Mar 28, 2017
Merged

Fix memory leak in ipaddr.c #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions ipaddr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ int ipaddr_local(struct ipaddr *addr, const char *name, int port, int mode) {
#endif
}

static void dns_freeaddrinfo(struct addrinfo *ent) {
free(ent);
}

int ipaddr_remote(struct ipaddr *addr, const char *name, int port, int mode,
int64_t deadline) {
int rc = ipaddr_literal(addr, name, port, mode);
Expand Down Expand Up @@ -296,33 +300,47 @@ int ipaddr_remote(struct ipaddr *addr, const char *name, int port, int mode,
int err = errno;
fdclean(fd);
errno = err;
if(dill_slow(rc < 0)) return -1;
if(dill_slow(rc < 0)) {
dns_ai_close(ai);
return -1;
}
continue;
}
if(rc == ENOENT || (rc >= DNS_EBASE && rc <= DNS_ELAST))
break;
if(!ipv4 && it && it->ai_family == AF_INET)
if(!ipv4 && it && it->ai_family == AF_INET) {
ipv4 = it;
if(!ipv6 && it && it->ai_family == AF_INET6)
it = NULL;
}
if(!ipv6 && it && it->ai_family == AF_INET6) {
ipv6 = it;
it = NULL;
}
dns_freeaddrinfo(it); /* Ended up useless */
if(ipv4 && ipv6)
break;
}
switch(mode) {
case IPADDR_IPV4:
dns_freeaddrinfo(ipv6);
ipv6 = NULL;
break;
case IPADDR_IPV6:
dns_freeaddrinfo(ipv4);
ipv4 = NULL;
break;
case 0:
case IPADDR_PREF_IPV4:
if(ipv4)
ipv6 = NULL;
if(ipv4) {
dns_freeaddrinfo(ipv6);
ipv6 = NULL;
}
break;
case IPADDR_PREF_IPV6:
if(ipv6)
ipv4 = NULL;
if(ipv6) {
dns_freeaddrinfo(ipv4);
ipv4 = NULL;
}
break;
default:
dill_assert(0);
Expand All @@ -331,13 +349,17 @@ int ipaddr_remote(struct ipaddr *addr, const char *name, int port, int mode,
struct sockaddr_in *inaddr = (struct sockaddr_in*)addr;
memcpy(inaddr, ipv4->ai_addr, sizeof (struct sockaddr_in));
inaddr->sin_port = htons(port);
dns_freeaddrinfo(ipv4);
dns_freeaddrinfo(ipv6);
dns_ai_close(ai);
return 0;
}
if(ipv6) {
struct sockaddr_in6 *inaddr = (struct sockaddr_in6*)addr;
memcpy(inaddr, ipv6->ai_addr, sizeof (struct sockaddr_in6));
inaddr->sin6_port = htons(port);
dns_freeaddrinfo(ipv4);
dns_freeaddrinfo(ipv6);
dns_ai_close(ai);
return 0;
}
Expand Down