[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.6 1/1] qapi: Don't pass NULL to printf in strin
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL for-2.6 1/1] qapi: Don't pass NULL to printf in string input visitor |
Date: |
Fri, 29 Apr 2016 11:19:08 +0200 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/string-input-visitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index ab12953..5ea2d77 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");
}
--
2.5.5