qdev: fix use-after-free regression from becdfa00cf

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>
This commit is contained in:
Marc-André Lureau 2016-11-07 13:59:22 +04:00 committed by Paolo Bonzini
parent 5122787580
commit 2209401fa7
1 changed files with 2 additions and 6 deletions

View File

@ -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)