OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5122787
)
qdev: fix use-after-free regression from becdfa00cfa
author
Marc-André Lureau
<marcandre.lureau@redhat.com>
Mon, 7 Nov 2016 09:59:22 +0000
(13:59 +0400)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Thu, 10 Nov 2016 15:01:09 +0000
(16:01 +0100)
Spotted by Coverity, CID
1365383
.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <
20161107095922
.31676-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/core/qdev-properties-system.c
patch
|
blob
|
history
diff --git
a/hw/core/qdev-properties-system.c
b/hw/core/qdev-properties-system.c
index
c35f0f5
..
1b7ea50
100644
(file)
--- a/
hw/core/qdev-properties-system.c
+++ b/
hw/core/qdev-properties-system.c
@@
-200,18
+200,14
@@
static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
}
s = qemu_chr_find(str);
- g_free(str);
if (s == NULL) {
error_setg(errp, "Property '%s.%s' can't find value '%s'",
object_get_typename(obj), prop->name, str);
- return;
- }
-
- if (!qemu_chr_fe_init(be, s, errp)) {
+ } else if (!qemu_chr_fe_init(be, s, errp)) {
error_prepend(errp, "Property '%s.%s' can't take value '%s': ",
object_get_typename(obj), prop->name, str);
- return;
}
+ g_free(str);
}
static void release_chr(Object *obj, const char *name, void *opaque)