Re: [PATCH] Don't crash if ai_canonname comes back as null

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 29, 2009, 23:21 UTC
Message-ID: <7v63gn59mw.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <C2AC0D7A-3E11-4A3A-8447-5D7582547B13@gmail.com>

Augie Fackler <durin42@gmail.com> writes:

> Fixes a weird bug where git-daemon was segfaulting
> when started by sh(1) because ai_canonname was null.
> ---
> Fixed based on feedback.

Hmm.

I've been waiting for feedback to a patch proposed earlier in the same area, which is <49F5BA55.3060606@googlemail.com> ($gmane/117670). How does this new one relate to it?

Show 20 quoted lines

>  daemon.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/daemon.c b/daemon.c
> index 13401f1..ae21d92 100644
> --- a/daemon.c
> +++ b/daemon.c
> @@ -459,7 +459,7 @@ static void parse_extra_args(char *extra_args, int
> buflen)
>  				inet_ntop(AF_INET, &sin_addr->sin_addr,
>  					  addrbuf, sizeof(addrbuf));
>  				free(canon_hostname);
> -				canon_hostname = xstrdup(ai->ai_canonname);
> +				canon_hostname = ai->ai_canonname ?
> xstrdup(ai->ai_canonname) : NULL;
>  				free(ip_address);
>  				ip_address = xstrdup(addrbuf);
>  				break;
> --
> 1.6.2.GIT