diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-30 21:46:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-01-30 21:46:36 +0000 |
| commit | 4fb4400bcfce402d8918e7ff74ee6ebd83e4574c (patch) | |
| tree | 3d6991aec21f8d1ca6dbd7ec0a4bf4c5d375cd0b /app/xdm/access.c | |
| parent | f087270de84eaca5c053f4b2ba39a36883cb7576 (diff) | |
getLocalAddress(): return 127.0.0.1 if the hostname doesn't resolve.
This code already does this if IPv6 support is compiled in. It
was dereferencing a NULL pointer in the IPv4 only case.
Diffstat (limited to 'app/xdm/access.c')
| -rw-r--r-- | app/xdm/access.c | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/app/xdm/access.c b/app/xdm/access.c index 0e612a18c..075c342a1 100644 --- a/app/xdm/access.c +++ b/app/xdm/access.c @@ -1,5 +1,5 @@ /* - * $XdotOrg$ + * $XdotOrg: app/xdm/access.c,v 1.2 2004/04/23 19:54:42 eich Exp $ * $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -139,8 +139,17 @@ getLocalAddress (void) struct hostent *hostent; hostent = gethostbyname (localHostname()); - XdmcpAllocARRAY8 (&localAddress, hostent->h_length); - memmove( localAddress.data, hostent->h_addr, hostent->h_length); + if (hostent != NULL) { + XdmcpAllocARRAY8 (&localAddress, hostent->h_length); + memmove(localAddress.data, hostent->h_addr, hostent->h_length); + } else { + /* Assume 127.0.0.1 */ + XdmcpAllocARRAY8 (&localAddress, 4); + localAddress.data[0] = 127; + localAddress.data[1] = 0; + localAddress.data[2] = 0; + localAddress.data[3] = 1; + } #endif } @@ -198,7 +207,7 @@ FreeAccessDatabase (void) next = d->next; FreeDisplayEntry (d); } - database = 0; + database = NULL; } #define WORD_LEN 256 @@ -310,7 +319,7 @@ tryagain: void *addr=NULL; size_t addr_length=0; #if defined(IPv6) && defined(AF_INET6) - struct addrinfo *ai; + struct addrinfo *ai = NULL; #else struct hostent *hostent = gethostbyname (hostOrAlias); #endif @@ -346,17 +355,26 @@ tryagain: Debug ("No such host %s\n", hostOrAlias); LogError ("Access file \"%s\", host \"%s\" not found\n", accessFile, hostOrAlias); free ((char *) h); +#if defined(IPv6) && defined(AF_INET6) + if (ai) + freeaddrinfo(ai); +#endif goto tryagain; } if (!XdmcpAllocARRAY8 (&h->entry.hostAddress, addr_length)) { LogOutOfMem ("ReadHostEntry\n"); free ((char *) h); +#if defined(IPv6) && defined(AF_INET6) + if (ai) + freeaddrinfo(ai); +#endif return NULL; } memmove( h->entry.hostAddress.data, addr, addr_length); #if defined(IPv6) && defined(AF_INET6) - freeaddrinfo(ai); + if (ai) + freeaddrinfo(ai); #endif } return h; @@ -430,7 +448,7 @@ ReadDisplayEntry (FILE *file) int addrtype = 0; #if defined(IPv6) && defined(AF_INET6) - struct addrinfo *ai; + struct addrinfo *ai = NULL; if (getaddrinfo(displayOrAlias, NULL, NULL, &ai) == 0) { addrtype = ai->ai_addr->sa_family; @@ -457,6 +475,10 @@ ReadDisplayEntry (FILE *file) { LogError ("Access file %s, display %s unknown\n", accessFile, displayOrAlias); free ((char *) d); +#if defined(IPv6) && defined(AF_INET6) + if (ai) + freeaddrinfo(ai); +#endif return NULL; } d->type = DISPLAY_ADDRESS; @@ -464,9 +486,17 @@ ReadDisplayEntry (FILE *file) if (!XdmcpAllocARRAY8 (&display->clientAddress, addr_length)) { free ((char *) d); +#if defined(IPv6) && defined(AF_INET6) + if (ai) + freeaddrinfo(ai); +#endif return NULL; } memmove( display->clientAddress.data, addr, addr_length); +#if defined(IPv6) && defined(AF_INET6) + if (ai) + freeaddrinfo(ai); +#endif switch (addrtype) { #ifdef AF_UNIX |