X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_cmdline%2Fcmdline_parse_portlist.c;h=9c1fe3ea5834de7ad3cdc92092fcfe4bd9bba35f;hb=f161fb6ad5125e8286ea6aaa01e8903dacf21161;hp=d7a93ccb9ef07f4ca7f4295c8581f516f3b20e20;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/lib/librte_cmdline/cmdline_parse_portlist.c b/lib/librte_cmdline/cmdline_parse_portlist.c index d7a93ccb9e..9c1fe3ea58 100644 --- a/lib/librte_cmdline/cmdline_parse_portlist.c +++ b/lib/librte_cmdline/cmdline_parse_portlist.c @@ -78,7 +78,7 @@ struct cmdline_token_ops cmdline_token_portlist_ops = { }; static void -parse_set_list(cmdline_portlist_t * pl, int low, int high) +parse_set_list(cmdline_portlist_t *pl, size_t low, size_t high) { do { pl->map |= (1 << low++); @@ -86,7 +86,7 @@ parse_set_list(cmdline_portlist_t * pl, int low, int high) } static int -parse_ports(cmdline_portlist_t * pl, const char * str) +parse_ports(cmdline_portlist_t *pl, const char *str) { size_t ps, pe; const char *first, *last; @@ -127,7 +127,7 @@ parse_ports(cmdline_portlist_t * pl, const char * str) int cmdline_parse_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, - const char *buf, void *res) + const char *buf, void *res, unsigned ressize) { unsigned int token_len = 0; char portlist_str[PORTLIST_TOKEN_SIZE+1]; @@ -136,6 +136,9 @@ cmdline_parse_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, if (!buf || ! *buf) return (-1); + if (res && ressize < sizeof(cmdline_portlist_t)) + return -1; + pl = res; while (!cmdline_isendoftoken(buf[token_len]) && @@ -145,7 +148,7 @@ cmdline_parse_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, if (token_len >= PORTLIST_TOKEN_SIZE) return (-1); - rte_snprintf(portlist_str, token_len+1, "%s", buf); + snprintf(portlist_str, token_len+1, "%s", buf); if (pl) { pl->map = 0; @@ -163,7 +166,7 @@ cmdline_get_help_portlist(__attribute__((unused)) cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size) { int ret; - ret = rte_snprintf(dstbuf, size, "range of ports as 3,4-6,8-19,20"); + ret = snprintf(dstbuf, size, "range of ports as 3,4-6,8-19,20"); if (ret < 0) return -1; return 0;