mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Fix string input visitor handling of invalid list

Browse Source 
As shown in the previous commit, the string input visitor was
treating bogus input as an empty list rather than an error.
Fix parse_str() to set errp, then the callers to exit early if
an error was reported.

Meanwhile, fix the testsuite to use the generated
qapi_free_int16List() instead of rolling our own, and to
validate the fixed behavior, while at the same time documenting
one more change that we'd like to make in a later patch (a
failed visit_start_list should guarantee a NULL pointer,
regardless of what things were on input).

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-23-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-04-28 15:45:30 -06:00 committed by Markus Armbruster
parent 7337468385
commit 74f24cb630
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qapi/string-input-visitor.c
View File

@ -44,7 +44,7 @@ static void free_range(void *range, void *dummy)
g_free(range);
}
static void parse_str(StringInputVisitor *siv, Error **errp)
static int parse_str(StringInputVisitor *siv, const char *name, Error **errp)
{
char *str = (char *) siv->string;
long long start, end;
@ -52,7 +52,7 @@ static void parse_str(StringInputVisitor *siv, Error **errp)
char *endptr;
if (siv->ranges) {
return;
return 0;
}
do {
@ -117,11 +117,14 @@ static void parse_str(StringInputVisitor *siv, Error **errp)
}
} while (str);
return;
return 0;
error:
g_list_foreach(siv->ranges, free_range, NULL);
g_list_free(siv->ranges);
siv->ranges = NULL;
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null",
"an int64 value or range");
return -1;
}
static void
@ -129,7 +132,9 @@ start_list(Visitor *v, const char *name, Error **errp)
{
StringInputVisitor *siv = to_siv(v);
parse_str(siv, errp);
if (parse_str(siv, name, errp) < 0) {
return;
}
siv->cur_range = g_list_first(siv->ranges);
if (siv->cur_range) {
@ -195,7 +200,9 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
return;
}
parse_str(siv, errp);
if (parse_str(siv, name, errp) < 0) {
return;
}
if (!siv->ranges) {
goto error;

12
tests/test-string-input-visitor.c
View File

@ -92,19 +92,17 @@ static void test_visitor_in_intList(TestInputVisitorData *data,
}
g_assert(!tmp);
tmp = res;
while (tmp) {
res = res->next;
g_free(tmp);
tmp = res;
}
qapi_free_int16List(res);
visitor_input_teardown(data, unused);
v = visitor_input_test_init(data, "not an int list");
/* FIXME: res should be NULL on failure, regardless of starting value */
res = NULL;
visit_type_int16List(v, NULL, &res, &err);
/* FIXME fix the visitor, then error_free_or_abort(&err) here */
error_free_or_abort(&err);
g_assert(!res);
}
static void test_visitor_in_bool(TestInputVisitorData *data,