[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 4/7] qom: Don't make link NULL on object_prop
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0 4/7] qom: Don't make link NULL on object_property_set_link() failure |
Date: |
Wed, 19 Mar 2014 22:45:39 +0100 |
From: Stefan Hajnoczi <address@hidden>
The error behavior of object_property_set_link() is dangerous. It sets
the link property object to NULL if an error occurs. A setter function
should either succeed or fail, it shouldn't leave the value NULL on
failure.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qom/object.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 2877a00..cc946d9 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1080,27 +1080,28 @@ static Object *object_resolve_link(Object *obj, const
char *name,
static void object_set_link_property(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
+ Error *local_err = NULL;
Object **child = opaque;
- Object *old_target;
- char *path;
-
- visit_type_str(v, &path, name, errp);
+ Object *old_target = *child;
+ Object *new_target = NULL;
+ char *path = NULL;
- old_target = *child;
- *child = NULL;
+ visit_type_str(v, &path, name, &local_err);
- if (strcmp(path, "") != 0) {
- Object *target;
-
- target = object_resolve_link(obj, name, path, errp);
- if (target) {
- object_ref(target);
- *child = target;
- }
+ if (!local_err && strcmp(path, "") != 0) {
+ new_target = object_resolve_link(obj, name, path, &local_err);
}
g_free(path);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ if (new_target) {
+ object_ref(new_target);
+ }
+ *child = new_target;
if (old_target != NULL) {
object_unref(old_target);
}
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0-rc1 0/7] QOM devices patch queue 2014-03-19, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 2/7] vl.c: Fix OpenBSD compilation issue due to namespace collisions, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 1/7] vl.c: Fix memory leak in qemu_register_machine(), Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 7/7] virtio-rng: Avoid default_backend refcount leak, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 3/7] qom: Split object_property_set_link(), Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 4/7] qom: Don't make link NULL on object_property_set_link() failure,
Andreas Färber <=
- [Qemu-devel] [PULL for-2.0 6/7] qom: Add check() argument to object_property_add_link(), Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 5/7] qom: Make QOM link property unref optional, Andreas Färber, 2014/03/19
- Re: [Qemu-devel] [PULL for-2.0-rc1 0/7] QOM devices patch queue 2014-03-19, Peter Maydell, 2014/03/19