X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fgetservbyname_r.c;h=cad6317ab84243e5bc8de3a1d8ce17eb4a688a5e;hb=1e7fb12f775a3e599be08da9835422d96c56f479;hp=8cdf622c06124acd7227839fcefb3e8393f892ce;hpb=af7c308ee66c4127700dd7843f885f7f2d030a0c;p=musl

diff --git a/src/network/getservbyname_r.c b/src/network/getservbyname_r.c
index 8cdf622c..cad6317a 100644
--- a/src/network/getservbyname_r.c
+++ b/src/network/getservbyname_r.c
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 #include "lookup.h"
 
 #define ALIGN (sizeof(struct { char a; char *b; }) - sizeof(char *))
@@ -15,6 +16,13 @@ int getservbyname_r(const char *name, const char *prots,
 	struct service servs[MAXSERVS];
 	int cnt, proto, align;
 
+	*res = 0;
+
+	/* Don't treat numeric port number strings as service records. */
+	char *end = "";
+	strtoul(name, &end, 10);
+	if (!*end) return ENOENT;
+
 	/* Align buffer */
 	align = -(uintptr_t)buf & ALIGN-1;
 	if (buflen < 2*sizeof(char *)+align)
@@ -26,7 +34,7 @@ int getservbyname_r(const char *name, const char *prots,
 	else if (!strcmp(prots, "udp")) proto = IPPROTO_UDP;
 	else return EINVAL;
 
-	cnt = __lookup_serv(servs, name, proto, 0);
+	cnt = __lookup_serv(servs, name, proto, 0, 0);
 	if (cnt<0) switch (cnt) {
 	case EAI_MEMORY:
 	case EAI_SYSTEM: