]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/ident-ai-canonname-could-be-null' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:22:32 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:22:32 +0000 (13:22 -0700)
In the codepath that comes up with the hostname to be used in an
e-mail when the user didn't tell us, we looked at ai_canonname
field in struct addrinfo without making sure it is not NULL first.

* jk/ident-ai-canonname-could-be-null:
  ident: handle NULL ai_canonname

1  2 
ident.c

diff --cc ident.c
Simple merge