From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 6 Mar 2015 14:30:42 +0000 (+0100)
Subject: cli sockets: check for a digit prior using atoi
X-Git-Tag: gnutls_3_4_0~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b03bb52b9dab87523945d3c9ef5c0dbf00dfd23;p=thirdparty%2Fgnutls.git

cli sockets: check for a digit prior using atoi
---

diff --git a/src/socket.c b/src/socket.c
index f662c558e2..7ed9c3afac 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -362,6 +362,9 @@ const char *port_to_service(const char *sport, const char *proto)
 	unsigned int port;
 	struct servent *sr;
 
+	if (!c_isdigit(sport[0]))
+		return sport;
+
 	port = atoi(sport);
 	if (port == 0)
 		return sport;
@@ -371,7 +374,7 @@ const char *port_to_service(const char *sport, const char *proto)
 	sr = getservbyport(port, proto);
 	if (sr == NULL) {
 		fprintf(stderr,
-			"Warning: getservbyport() failed. Using port number as service.\n");
+			"Warning: getservbyport(%s) failed. Using port number as service.\n", sport);
 		return sport;
 	}