[PATCH] daemon.c: fix segfault on OS X
- From
Benjamin Kramer <benny.kra@googlemail.com>
- Date
- Apr 26, 2009, 20:01 UTC
- Message-ID
- <49F4BD9F.6070709@googlemail.com>
On OS X (and maybe other unices) getaddrinfo(3) returns NULL in the ai_canonname field if it is called with an IP address.
steps to reproduce: $ git daemon --export-all $ git clone git://127.0.0.1/frotz => git daemon's fork (silently) segfaults.
Remove the pointless loop while at it.
Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> --- daemon.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/daemon.c b/daemon.c index 13401f1..5f455ab 100644 --- a/daemon.c +++ b/daemon.c @@ -444,27 +444,27 @@ static void parse_extra_args(char *extra_args, int buflen) if (hostname) { #ifndef NO_IPV6 struct addrinfo hints; - struct addrinfo *ai, *ai0; + struct addrinfo *ai; int gai; static char addrbuf[HOST_NAME_MAX + 1]; memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; - gai = getaddrinfo(hostname, 0, &hints, &ai0); + gai = getaddrinfo(hostname, 0, &hints, &ai); if (!gai) { - for (ai = ai0; ai; ai = ai->ai_next) { - struct sockaddr_in *sin_addr = (void *)ai->ai_addr; + struct sockaddr_in *sin_addr = (void *)ai->ai_addr; - inet_ntop(AF_INET, &sin_addr->sin_addr, - addrbuf, sizeof(addrbuf)); + inet_ntop(AF_INET, &sin_addr->sin_addr, + addrbuf, sizeof(addrbuf)); + free(ip_address); + ip_address = xstrdup(addrbuf); + + if (ai->ai_canonname) { free(canon_hostname); canon_hostname = xstrdup(ai->ai_canonname); - free(ip_address); - ip_address = xstrdup(addrbuf); - break; } - freeaddrinfo(ai0); + freeaddrinfo(ai); } #else struct hostent *hent;
-- 1.6.3.rc2.9.g76386