X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_cmdline%2Fcmdline_parse_ipaddr.c;h=7f3359942304ccd7ea9872b9b4cd1c2e367c0db2;hb=62945e029e86bba5fb833e969c3c22f84d58c1cb;hp=501f35ba7290fb76ebb01ad607491522c76abac2;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git

diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 501f35ba72..7f33599423 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -306,7 +306,8 @@ inet_pton6(const char *src, unsigned char *dst)
 }
 
 int
-cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
+cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
+	unsigned ressize)
 {
 	struct cmdline_token_ipaddr *tk2;
 	unsigned int token_len = 0;
@@ -315,6 +316,9 @@ cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
 	char *prefix, *prefix_end;
 	long prefixlen = 0;
 
+	if (res && ressize < sizeof(cmdline_ipaddr_t))
+		return -1;
+
 	if (!buf || !tk || ! *buf)
 		return -1;
 
@@ -327,7 +331,7 @@ cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
 	if (token_len >= INET6_ADDRSTRLEN+4)
 		return -1;
 
-	rte_snprintf(ip_str, token_len+1, "%s", buf);
+	snprintf(ip_str, token_len+1, "%s", buf);
 
 	/* convert the network prefix */
 	if (tk2->ipaddr_data.flags & CMDLINE_IPADDR_NETWORK) {
@@ -379,25 +383,25 @@ int cmdline_get_help_ipaddr(cmdline_parse_token_hdr_t *tk, char *dstbuf,
 
 	switch (tk2->ipaddr_data.flags) {
 	case CMDLINE_IPADDR_V4:
-		rte_snprintf(dstbuf, size, "IPv4");
+		snprintf(dstbuf, size, "IPv4");
 		break;
 	case CMDLINE_IPADDR_V6:
-		rte_snprintf(dstbuf, size, "IPv6");
+		snprintf(dstbuf, size, "IPv6");
 		break;
 	case CMDLINE_IPADDR_V4|CMDLINE_IPADDR_V6:
-		rte_snprintf(dstbuf, size, "IPv4/IPv6");
+		snprintf(dstbuf, size, "IPv4/IPv6");
 		break;
 	case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V4:
-		rte_snprintf(dstbuf, size, "IPv4 network");
+		snprintf(dstbuf, size, "IPv4 network");
 		break;
 	case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V6:
-		rte_snprintf(dstbuf, size, "IPv6 network");
+		snprintf(dstbuf, size, "IPv6 network");
 		break;
 	case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V4|CMDLINE_IPADDR_V6:
-		rte_snprintf(dstbuf, size, "IPv4/IPv6 network");
+		snprintf(dstbuf, size, "IPv4/IPv6 network");
 		break;
 	default:
-		rte_snprintf(dstbuf, size, "IPaddr (bad flags)");
+		snprintf(dstbuf, size, "IPaddr (bad flags)");
 		break;
 	}
 	return 0;