X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_cmdline%2Fcmdline_parse_num.c;h=e507ec4f1f20d68cf44d71a4475aeeeb811359d3;hb=380a7aab1ae2;hp=0b9e4d0dc38c08c0a655a3392322c02e8f3582ba;hpb=6f41fe75e2dd8dd38f7bea7b9501edd4f9b72fa5;p=dpdk.git

diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c
index 0b9e4d0dc3..e507ec4f1f 100644
--- a/lib/librte_cmdline/cmdline_parse_num.c
+++ b/lib/librte_cmdline/cmdline_parse_num.c
@@ -119,10 +119,40 @@ add_to_res(unsigned int c, uint64_t *res, unsigned int base)
 	return 0;
 }
 
+static int
+check_res_size(struct cmdline_token_num_data *nd, unsigned ressize)
+{
+	switch (nd->type) {
+	case INT8:
+	case UINT8:
+		if (ressize < sizeof(int8_t))
+			return -1;
+		break;
+	case INT16:
+	case UINT16:
+		if (ressize < sizeof(int16_t))
+			return -1;
+		break;
+	case INT32:
+	case UINT32:
+		if (ressize < sizeof(int32_t))
+			return -1;
+		break;
+	case INT64:
+	case UINT64:
+		if (ressize < sizeof(int64_t))
+			return -1;
+		break;
+	default:
+		return -1;
+	}
+	return 0;
+}
 
 /* parse an int */
 int
-cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
+cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
+	unsigned ressize)
 {
 	struct cmdline_token_num_data nd;
 	enum num_parse_state_t st = START;
@@ -141,6 +171,12 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 
 	memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd));
 
+	/* check that we have enough room in res */
+	if (res) {
+		if (check_res_size(&nd, ressize) < 0)
+			return -1;
+	}
+
 	while ( st != ERROR && c && ! cmdline_isendoftoken(c) ) {
 		debug_printf("%c %x -> ", c, c);
 		switch (st) {
@@ -214,7 +250,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 
 		case HEX:
 			st = HEX_OK;
-			/* no break */
+			/* fall-through no break */
 		case HEX_OK:
 			if (c >= '0' && c <= '9') {
 				if (add_to_res(c - '0', &res1, 16) < 0)
@@ -246,7 +282,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 
 		case BIN:
 			st = BIN_OK;
-			/* no break */
+			/* fall-through */
 		case BIN_OK:
 			if (c >= '0' && c <= '1') {
 				if (add_to_res(c - '0', &res1, 2) < 0)
@@ -279,35 +315,35 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 	case BIN_OK:
 		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
 			if (res) *(int8_t *)res = (int8_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
 			if (res) *(int16_t *)res = (int16_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
 			if (res) *(int32_t *)res = (int32_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT64 && res1 <= INT64_MAX ) {
 			if (res) *(int64_t *)res = (int64_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
 			if (res) *(uint8_t *)res = (uint8_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
 			if (res) *(uint16_t *)res = (uint16_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == UINT32 && res1 <= UINT32_MAX ) {
 			if (res) *(uint32_t *)res = (uint32_t) res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == UINT64 ) {
 			if (res) *(uint64_t *)res = res1;
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else {
 			return -1;
@@ -317,19 +353,19 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 	case DEC_NEG_OK:
 		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
 			if (res) *(int8_t *)res = (int8_t) (-res1);
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
 			if (res) *(int16_t *)res = (int16_t) (-res1);
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
 			if (res) *(int32_t *)res = (int32_t) (-res1);
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else if ( nd.type == INT64 && res1 <= (uint64_t)INT64_MAX + 1 ) {
 			if (res) *(int64_t *)res = (int64_t) (-res1);
-			return (buf-srcbuf);
+			return buf-srcbuf;
 		}
 		else {
 			return -1;