From 2dcfe8cba5cea373f86a15ab166c856c9689be8c Mon Sep 17 00:00:00 2001 From: Alban Browaeys Date: Sun, 30 Nov 2014 03:10:53 +0100 Subject: [PATCH] os: ConvertAddress can return null an address if FamilyLocal Partial revert of 2566835b which fixed the addr unintialized state but went too far as to check for null before conditions that did not required it. --- os/access.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/access.c b/os/access.c index 5c510de..050c8d3 100644 --- a/os/access.c +++ b/os/access.c @@ -1386,12 +1386,12 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) } for (host = validhosts; host; host = host->next) { if (host->family == FamilyServerInterpreted) { - if (addr && siAddrMatch(family, addr, len, host, client)) { + if (siAddrMatch(family, addr, len, host, client)) { return 0; } } else { - if (addr && addrEqual(family, addr, len, host)) + if (addrEqual(family, addr, len, host)) return 0; } -- 2.0.1