diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:14 -0700 |
| commit | fff948fe0e24d8f537b91c1de0349dc2e105dcd9 (patch) | |
| tree | af687d705ee7bec7b2f20e8a7f65b4527b2dedbe | |
| parent | Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' (diff) | |
| parent | ident: handle NULL ai_canonname (diff) | |
| download | tgif-fff948fe0e24d8f537b91c1de0349dc2e105dcd9.tar.xz | |
Merge branch 'jk/ident-ai-canonname-could-be-null'
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
| -rw-r--r-- | ident.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -101,7 +101,7 @@ static int canonical_name(const char *host, struct strbuf *out) memset (&hints, '\0', sizeof (hints)); hints.ai_flags = AI_CANONNAME; if (!getaddrinfo(host, NULL, &hints, &ai)) { - if (ai && strchr(ai->ai_canonname, '.')) { + if (ai && ai->ai_canonname && strchr(ai->ai_canonname, '.')) { strbuf_addstr(out, ai->ai_canonname); status = 0; } |