app/testpmd: fix hexadecimal parser with odd length

Current hex string parser assumes input has even characters number.
The parser fails input string with odd length.

The patch parses hex strings with even and odd length.
Parse result of an input with odd length will match result of
even length input, that has `0` as MSB, following by the original
sequence.
For example:
"0x1" results in *dst={0x01, 0x00}, *size=1
"0xabc" results in *dst={0x0a, 0xbc, 0x00}, *size=2

Fixes: 169a9fed1f4c ("app/testpmd: fix hex string parser support for flow API")
Cc: stable@dpdk.org
Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 1b00ae5..bbe3dc0 100644 (file)
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -7702,9 +7702,8 @@ error:
 static int
 parse_hex_string(const char *src, uint8_t *dst, uint32_t *size)
 {
-       char *c = NULL;
-       uint32_t i, len;
-       char tmp[3];
+       uint32_t left = *size;
+       const uint8_t *head = dst;
 
        /* Check input parameters */
        if ((src == NULL) ||
@@ -7714,19 +7713,23 @@ parse_hex_string(const char *src, uint8_t *dst, uint32_t *size)
                return -1;
 
        /* Convert chars to bytes */
-       for (i = 0, len = 0; i < *size; i += 2) {
-               snprintf(tmp, 3, "%s", src + i);
-               dst[len++] = strtoul(tmp, &c, 16);
-               if (*c != 0) {
-                       len--;
-                       dst[len] = 0;
-                       *size = len;
+       while (left) {
+               char tmp[3], *end = tmp;
+               uint32_t read_lim = left & 1 ? 1 : 2;
+
+               snprintf(tmp, read_lim + 1, "%s", src);
+               *dst = strtoul(tmp, &end, 16);
+               if (*end) {
+                       *dst = 0;
+                       *size = (uint32_t)(dst - head);
                        return -1;
                }
+               left -= read_lim;
+               src += read_lim;
+               dst++;
        }
-       dst[len] = 0;
-       *size = len;
-
+       *dst = 0;
+       *size = (uint32_t)(dst - head);
        return 0;
 }