[gentoo-commits] proj/net-tools:gentoo commit in: lib/

[Mike Frysinger]

commit:     7ae4aa5619cc7e7067ea6ee24a4d49fa5b4a72fd
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 00:08:37 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 00:11:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git;a=commit;h=7ae4aa56

get_sname: avoid buffer overflows if proto name is too long

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 lib/inet.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/inet.c b/lib/inet.c
index 073c8a3..60e55df 100644
--- a/lib/inet.c
+++ b/lib/inet.c
@@ -431,16 +431,17 @@ const char *get_sname(int socknumber, const char *proto, int numeric)
 	init = 1;
     }
     buffer[0] = '\0';
-    if (!strcmp(proto, "tcp")) {
-	if ((item = searchlist(tcp_name, socknumber)) != NULL)
-	    sprintf(buffer, "%s", item->name);
-    } else if (!strcmp(proto, "udp")) {
-	if ((item = searchlist(udp_name, socknumber)) != NULL)
-	    sprintf(buffer, "%s", item->name);
-    } else if (!strcmp(proto, "raw")) {
-	if ((item = searchlist(raw_name, socknumber)) != NULL)
-	    sprintf(buffer, "%s", item->name);
-
+    if (!strcmp(proto, "tcp"))
+	item = searchlist(tcp_name, socknumber);
+    else if (!strcmp(proto, "udp"))
+	item = searchlist(udp_name, socknumber);
+    else if (!strcmp(proto, "raw"))
+	item = searchlist(raw_name, socknumber);
+    else
+	item = NULL;
+    if (item) {
+	strncpy(buffer, item->name, sizeof(buffer));
+	buffer[sizeof(buffer) - 1] = '\0';
     }
 
     if (!buffer[0]) {