[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 10/13] qemu-char: minor mux chardev fixes
From: |
Gerd Hoffmann |
Subject: |
[Qemu-trivial] [PATCH 10/13] qemu-char: minor mux chardev fixes |
Date: |
Fri, 21 Jun 2013 12:38:22 +0200 |
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 <address@hidden>
---
qemu-char.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 1c0903f..65c0c48 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3193,7 +3193,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);
@@ -3220,9 +3220,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);
@@ -3230,6 +3228,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
qapi_out:
qapi_free_ChardevBackend(backend);
qapi_free_ChardevReturn(ret);
+ g_free(bid);
return chr;
}
--
1.7.9.7
- [Qemu-trivial] [PATCH 06/13] qemu-char: print notification to stderr, (continued)
- [Qemu-trivial] [PATCH 06/13] qemu-char: print notification to stderr, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 02/13] qemu-socket: drop pointless allocation, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 05/13] qemu-char: use more specific error_setg_* variants, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 09/13] qemu-char: use ChardevBackendKind in in CharDriver, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 08/13] qemu-char: don't leak opts on error, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 07/13] qemu-char: fix documentation for telnet+wait socket flags, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 11/13] qemu-char: add -chardev mux support, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 12/13] qemu-char: report udb backend errors, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 13/13] qemu-socket: don't leak opts on error, Gerd Hoffmann, 2013/06/21
- [Qemu-trivial] [PATCH 10/13] qemu-char: minor mux chardev fixes,
Gerd Hoffmann <=
- Re: [Qemu-trivial] [PATCH 00/13] A bunch of little socket + chardev fixes, Michael Tokarev, 2013/06/21