d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't touch ai_canonname without checking NULL. Current

Browse Source 
implementation of getaddrinfo() may return NULL ai_canonname.
There is no consensus how getaddrinfo() should fill ai_canonname
when numeric hostname is given.

Reported by:	kris
This commit is contained in:
Hajimu UMEMOTO 2000-09-23 15:40:12 +00:00
parent 92b123a002
commit 2f0cc2fd05
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/tcp_wrappers/socket.c
View File

@ -245,7 +245,8 @@ struct host_info *host;
host->name,
(sin->sa_family == AF_INET) ? "AF_INET" : "AF_INET6");
} else if (STR_NE(host->name, res0->ai_canonname)
} else if ((res0->ai_canonname == NULL
|| STR_NE(host->name, res0->ai_canonname))
&& STR_NE(host->name, "localhost")) {
/*
@ -255,7 +256,8 @@ struct host_info *host;
*/
tcpd_warn("host name/name mismatch: %s != %.*s",
host->name, STRING_LENGTH, res0->ai_canonname);
host->name, STRING_LENGTH,
(res0->ai_canonname == NULL) ? "" : res0->ai_canonname);
} else {
@ -294,7 +296,8 @@ struct host_info *host;
getnameinfo(sin, salen, hname, sizeof(hname),
NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
tcpd_warn("host name/address mismatch: %s != %.*s",
hname, STRING_LENGTH, res0->ai_canonname);
hname, STRING_LENGTH,
(res0->ai_canonname == NULL) ? "" : res0->ai_canonname);
}
strcpy(host->name, paranoid); /* name is bad, clobber it */
if (res0)