mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Plug getaddrinfo(3) memory leak

Browse Source 
choose_server() calls getaddrinfo(3) but never frees the result.
Minimal fix that relies on getaddrinfo(3) only updating the "res"
pointer if the call was successful.

While here, call freeaddrinfo(3) earlier in whois(), less code and less
overall memory used since whois() can recurse.

ok millert@ tb@ benno@
This commit is contained in:
jca 2018-06-19 11:28:11 +00:00
parent 413ec31c49
commit d874525269
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/whois/whois.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: whois.c,v 1.57 2018/06/17 15:34:54 florian Exp $ */
/* $OpenBSD: whois.c,v 1.58 2018/06/19 11:28:11 jca Exp $ */
/*
* Copyright (c) 1980, 1993
@ -196,13 +196,13 @@ whois(const char *query, const char *server, const char *port, int flags)
}
break; /*okay*/
}
freeaddrinfo(res);
if (s == -1) {
if (reason) {
errno = error;
warn("%s: %s", server, reason);
} else
warn("unknown error in connection attempt");
freeaddrinfo(res);
return (1);
}
@ -269,7 +269,7 @@ whois(const char *query, const char *server, const char *port, int flags)
error = whois(query, nhost, port, 0);
free(nhost);
}
freeaddrinfo(res);
return (error);
}
@ -287,7 +287,7 @@ choose_server(const char *name, const char *country, char **tofree)
char *server;
const char *qhead;
char *ep;
struct addrinfo hints, *res;
struct addrinfo hints, *res = NULL;
memset(&hints, 0, sizeof(hints));
hints.ai_flags = 0;
@ -339,6 +339,8 @@ choose_server(const char *name, const char *country, char **tofree)
if (asprintf(&server, "%s%s", qhead, QNICHOST_TAIL) == -1)
err(1, NULL);
}
if (res != NULL)
freeaddrinfo(res);
*tofree = server;
return (server);