X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcanon-host.c;h=0c7eac4f0685614c001bd313d5b2182472392b69;hb=a655ee23a7d332ff458d3785df802f69acd6ea4f;hp=1f6b575ee15d756272855d475c55cbd83dfe0879;hpb=eef6a0f21a7b5a7020a1fecd599b23838c469b61;p=gnulib.git

diff --git a/lib/canon-host.c b/lib/canon-host.c
index 1f6b575ee..0c7eac4f0 100644
--- a/lib/canon-host.c
+++ b/lib/canon-host.c
@@ -43,6 +43,8 @@
 # include <arpa/inet.h>
 #endif
 
+void free ();
+
 /* Returns the canonical hostname associated with HOST (allocated in a static
    buffer), or 0 if it can't be determined.  */
 char *
@@ -67,9 +69,23 @@ canon_host (const char *host)
 	}
 
       if (addr && strcmp (he->h_name, addr) == 0)
-	/* gethostbyname() cheated!  Lookup the host name via the address
-	   this time to get the actual host name.  */
-	he = gethostbyaddr (he->h_addr, he->h_length, he->h_addrtype);
+	{
+	  /* gethostbyname has returned a string representation of the IP
+	     address, for example, "127.0.0.1".  So now, look up the host
+	     name via the address.  Although it may seem reasonable to look
+	     up the host name via the address, we must not pass `he->h_addr'
+	     directly to gethostbyaddr because on some systems he->h_addr
+	     is located in a static library buffer that is reused in the
+	     gethostbyaddr call.  Make a copy and use that instead.  */
+	  char *h_addr_copy = strdup (he->h_addr);
+	  if (h_addr_copy == NULL)
+	    he = NULL;
+	  else
+	    {
+	      he = gethostbyaddr (h_addr_copy, he->h_length, he->h_addrtype);
+	      free (h_addr_copy);
+	    }
+	}
 # endif /* HAVE_GETHOSTBYADDR */
 
       if (he)