no message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@88616 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/main/util.c b/src/main/util.c
index cdc3ac5b1adc692fccc16b4174976da7d7bd2cb5..b857b0beefcf85c199106adb6bcc4b3ab9c950c6 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -2013,12 +2013,14 @@ static char *find_fqdn(pool *a, struct hostent *p)
     int x;
 
     if (!strchr(p->h_name, '.')) {
-       for (x = 0; p->h_aliases[x]; ++x) {
-           if (strchr(p->h_aliases[x], '.') &&
-               (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
-               return ap_pstrdup(a, p->h_aliases[x]);
-       }
-       return NULL;
+        if (p->h_aliases) {
+               for (x = 0; p->h_aliases[x]; ++x) {
+                if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
+                       (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
+                           return ap_pstrdup(a, p->h_aliases[x]);
+            }
+           }
+           return NULL;
     }
     return ap_pstrdup(a, (void *) p->h_name);
 }
@@ -2047,7 +2049,7 @@ char *ap_get_local_host(pool *a)
         if ((!(p = gethostbyname(str))) 
             || (!(server_hostname = find_fqdn(a, p)))) {
             /* Recovery - return the default servername by IP: */
-            if (p && p->h_addr_list[0]) {
+            if (p && p->h_addr_list && p->h_addr_list[0]) {
                 ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
                server_hostname = ap_pstrdup(a, str);
                 /* We will drop through to report the IP-named server */