There are some issues in parse_num_list():
1. The end variable is assigned twice when parsing_end is true. 2. The function does not check that parsing_end should finally be false.
Clean up parse_num_list() and fix these issues.
Signed-off-by: Yuntao Wang ytcoode@gmail.com --- tools/testing/selftests/bpf/testing_helpers.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c index 795b6798ccee..82f0e2d99c23 100644 --- a/tools/testing/selftests/bpf/testing_helpers.c +++ b/tools/testing/selftests/bpf/testing_helpers.c @@ -20,16 +20,16 @@ int parse_num_list(const char *s, bool **num_set, int *num_set_len) if (errno) return -errno;
- if (parsing_end) - end = num; - else + if (!parsing_end) { start = num; + if (*next == '-') { + s = next + 1; + parsing_end = true; + continue; + } + }
- if (!parsing_end && *next == '-') { - s = next + 1; - parsing_end = true; - continue; - } else if (*next == ',') { + if (*next == ',') { parsing_end = false; s = next + 1; end = num; @@ -60,7 +60,7 @@ int parse_num_list(const char *s, bool **num_set, int *num_set_len) set[i] = true; }
- if (!set) + if (!set || parsing_end) return -EINVAL;
*num_set = set;