mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon.c: fix segfault on OS X

Browse Source 
On OS X (and maybe other unices), getaddrinfo(3) returns NULL
in the ai_canonname field if it's called with an IP address for
the hostname. We'll now use the IP address for the hostname if
ai_canonname was NULL, this also matches the behaviour on Linux.

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. There is only one iteration
because of the break; on the last line and there are no continues.

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Benjamin Kramer
2009-04-27 15:59:49 +02:00
committed by Junio C Hamano
parent 0c44c94309
commit 3e8a00ae1d
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.c
View File

@ -444,27 +444,27 @@ static void parse_extra_args(char *extra_args, int buflen)
if (hostname) { if (hostname) {
#ifndef NO_IPV6 #ifndef NO_IPV6
struct addrinfo hints; struct addrinfo hints;
struct addrinfo *ai, *ai0; struct addrinfo *ai;
int gai; int gai;
static char addrbuf[HOST_NAME_MAX + 1]; static char addrbuf[HOST_NAME_MAX + 1];
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
gai = getaddrinfo(hostname, 0, &hints, &ai0); gai = getaddrinfo(hostname, 0, &hints, &ai);
if (!gai) { 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, inet_ntop(AF_INET, &sin_addr->sin_addr,
addrbuf, sizeof(addrbuf)); addrbuf, sizeof(addrbuf));
free(canon_hostname); free(ip_address);
canon_hostname = xstrdup(ai->ai_canonname); ip_address = xstrdup(addrbuf);
free(ip_address);
ip_address = xstrdup(addrbuf); free(canon_hostname);
break; canon_hostname = xstrdup(ai->ai_canonname ?
} ai->ai_canonname : ip_address);
freeaddrinfo(ai0);
freeaddrinfo(ai);
} }
#else #else
struct hostent *hent; struct hostent *hent;