aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2016-04-28 15:45:28 -0600
committerMarkus Armbruster <armbru@redhat.com>2016-04-29 11:11:36 +0200
commit0a40bdab0d48d9ce0c34bc2d319e44e92e0cc942 (patch)
tree9ed43f51107a77ecd48e00eaab83d742337accd7
parent736f85d5db701cc9d464a03b583d4a04606a0dd5 (diff)
qapi: Don't pass NULL to printf in string input visitor
Make sure the error message for visit_type_uint64() gracefully handles a NULL 'name' when called from the top level or a list context, as not all the world behaves like glibc in allowing NULL through a printf-family %s. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1461879932-9020-21-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--qapi/string-input-visitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index ab129536e4..5ea2d77b5a 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -222,7 +222,7 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
return;
error:
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null",
"an int64 value or range");
}