]> Git Repo - qemu.git/commitdiff
qdev: fix use-after-free regression from becdfa00cfa
authorMarc-André Lureau <[email protected]>
Mon, 7 Nov 2016 09:59:22 +0000 (13:59 +0400)
committerPaolo Bonzini <[email protected]>
Thu, 10 Nov 2016 15:01:09 +0000 (16:01 +0100)
Spotted by Coverity, CID 1365383.

Signed-off-by: Marc-André Lureau <[email protected]>
Message-Id: <20161107095922[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
hw/core/qdev-properties-system.c

index c35f0f59d6111c0696e12d49a6672782841209d3..1b7ea50e9f811b293792a8b672cd1066039aef7b 100644 (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)
This page took 0.025448 seconds and 4 git commands to generate.