X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetaddrinfo.c;h=aa07903445683ad40d73f87741e33cd1c393f314;hb=dd6ceef65e424d30db8706273f88c20b015012ce;hp=add56ba1bd85be25d639db7021edd369860f7eeb;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index add56ba1b..aa0790344 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -31,6 +31,9 @@
 /* Get memcpy, strdup. */
 #include <string.h>
 
+/* Get snprintf. */
+#include <stdio.h>
+
 #include <stdbool.h>
 
 #include "gettext.h"
@@ -38,7 +41,6 @@
 #define N_(String) String
 
 #include "inet_ntop.h"
-#include "snprintf.h"
 
 /* BeOS has AF_INET, but not PF_INET.  */
 #ifndef PF_INET
@@ -177,7 +179,7 @@ getaddrinfo (const char *restrict nodename,
       const char *proto =
 	(hints && hints->ai_socktype == SOCK_DGRAM) ? "udp" : "tcp";
 
-      if (!(hints->ai_flags & AI_NUMERICSERV))
+      if (hints == NULL || !(hints->ai_flags & AI_NUMERICSERV))
 	/* FIXME: Use getservbyname_r if available. */
 	se = getservbyname (servname, proto);