Fix parser using uninitialized memory
Introduced by e2979754b554d6a48cffa98f41fb59bc045922ac.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
diff --git a/parse.c b/parse.c
index 425411e..25de29e 100644
--- a/parse.c
+++ b/parse.c
@@ -26,14 +26,11 @@
return strlen(vp2->ival) - strlen(vp1->ival);
}
-static int posval_sort(struct fio_option *o, struct value_pair *vpmap)
+static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
{
const struct value_pair *vp;
int entries;
- if (!o->posval[0].ival)
- return 0;
-
memset(vpmap, 0, PARSE_MAX_VP * sizeof(struct value_pair));
for (entries = 0; entries < PARSE_MAX_VP; entries++) {
@@ -45,7 +42,6 @@
}
qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
- return 1;
}
static void show_option_range(struct fio_option *o, FILE *out)
@@ -491,7 +487,9 @@
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- if (!posval_sort(o, posval))
+ posval_sort(o, posval);
+
+ if (!o->posval[0].ival)
goto match;
ret = 1;