diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-06-24 08:39:53 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-06-28 22:10:33 +0400 |
| commit | dc2c4eca89ec5ee7b7a4c2563c991a14a7c5ee84 (patch) | |
| tree | 60a43a2c527761707500783317f0a48974816beb | |
| parent | 99aec0123ce5ba307dc357c5bf1e0f22d2be0931 (diff) | |
| download | qemu-dc2c4eca89ec5ee7b7a4c2563c991a14a7c5ee84.tar.gz | |
qemu-char: minor mux chardev fixes
mux failure path has a memory leak. creating a mux chardev can't
fail though, so just assert() that instead of fixing an error path
which never ever runs anyway ...
Also fix bid being leaked while being at it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | qemu-char.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qemu-char.c b/qemu-char.c index 90754e68de..392de29a91 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3186,7 +3186,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ChardevBackend *backend = g_new0(ChardevBackend, 1); ChardevReturn *ret = NULL; const char *id = qemu_opts_id(opts); - const char *bid = NULL; + char *bid = NULL; if (qemu_opt_get_bool(opts, "mux", 0)) { bid = g_strdup_printf("%s-base", id); @@ -3213,9 +3213,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, backend->kind = CHARDEV_BACKEND_KIND_MUX; backend->mux->chardev = g_strdup(bid); ret = qmp_chardev_add(id, backend, errp); - if (error_is_set(errp)) { - goto qapi_out; - } + assert(!error_is_set(errp)); } chr = qemu_chr_find(id); @@ -3223,6 +3221,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, qapi_out: qapi_free_ChardevBackend(backend); qapi_free_ChardevReturn(ret); + g_free(bid); return chr; } |