[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] qapi: clear given pointer
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 2/3] qapi: clear given pointer |
Date: |
Wed, 21 Sep 2016 14:36:28 +0400 |
Some getters already set *obj argument to NULL early, let's do this for
all for consistent behaviour in case of errors.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qapi/qmp-input-visitor.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index ea9972d..cb9d196 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -322,11 +322,13 @@ static void qmp_input_type_str(Visitor *v, const char
*name, char **obj,
QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QString *qstr = qobject_to_qstring(qobj);
+ if (obj) {
+ *obj = NULL;
+ }
if (!qobj) {
return;
}
if (!qstr) {
- *obj = NULL;
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"string");
return;
@@ -368,6 +370,9 @@ static void qmp_input_type_any(Visitor *v, const char
*name, QObject **obj,
QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
+ if (obj) {
+ *obj = NULL;
+ }
if (!qobj) {
return;
}
--
2.10.0
[Qemu-devel] [PATCH 3/3] iotests: fix expected error message, Marc-André Lureau, 2016/09/21