[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_ini
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_init() |
Date: |
Wed, 28 May 2014 11:17:01 +0200 |
blockdev_init() leaks bs_opts when qemu_opts_create() fails, i.e. when
the ID is bad. Missed in commit ec9c10d.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
blockdev.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 1cbcc1c..6460c70 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -352,7 +352,7 @@ static DriveInfo *blockdev_init(const char *file, QDict
*bs_opts,
opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
if (error) {
error_propagate(errp, error);
- return NULL;
+ goto err_no_opts;
}
qemu_opts_absorb_qdict(opts, bs_opts, &error);
@@ -565,8 +565,9 @@ bdrv_new_err:
g_free(dinfo->id);
g_free(dinfo);
early_err:
- QDECREF(bs_opts);
qemu_opts_del(opts);
+err_no_opts:
+ QDECREF(bs_opts);
return NULL;
}
--
1.9.3
- [Qemu-devel] [PATCH v2 00/14] block: Plug assorted memory leaks, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 02/14] block/vvfat: Plug memory leak in enable_write_target(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 01/14] qemu-img: Plug memory leak on block option help error path, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_snapshot_create(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 04/14] block: Plug memory leak on brv_open_image() error path, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 11/14] block/vvfat: Plug memory leak in check_directory_consistency(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 10/14] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 12/14] block/vvfat: Plug memory leak in read_directory(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 05/14] qemu-io: Support multiple -o in open command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_init(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 07/14] qemu-io: Don't print NULL when open without non-option arg fails, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 14/14] qemu-img: Plug memory leak in convert command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init(), Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 06/14] qemu-io: Plug memory leak in open command, Markus Armbruster, 2014/05/28
- [Qemu-devel] [PATCH v2 03/14] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Markus Armbruster, 2014/05/28
- Re: [Qemu-devel] [PATCH v2 00/14] block: Plug assorted memory leaks, Kevin Wolf, 2014/05/28