[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/17] blockdev: Plug memory leak in blockdev_init()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 08/17] blockdev: Plug memory leak in blockdev_init() |
Date: |
Mon, 2 Jun 2014 15:56:39 +0200 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 8cc42fb..652a052 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -351,7 +351,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);
@@ -564,8 +564,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.8.3.1
- [Qemu-devel] [PULL 00/17] Block patches, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 01/17] qemu-img: Plug memory leak on block option help error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 02/17] block/vvfat: Plug memory leak in enable_write_target(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 03/17] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 04/17] block: Plug memory leak on brv_open_image() error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 05/17] qemu-io: Support multiple -o in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 06/17] qemu-io: Plug memory leak in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 08/17] blockdev: Plug memory leak in blockdev_init(),
Kevin Wolf <=
- [Qemu-devel] [PULL 07/17] qemu-io: Don't print NULL when open without non-option arg fails, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 10/17] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 11/17] block/vvfat: Plug memory leak in check_directory_consistency(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 09/17] blockdev: Plug memory leak in drive_init(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 12/17] block/vvfat: Plug memory leak in read_directory(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 13/17] block/sheepdog: Plug memory leak in sd_snapshot_create(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 14/17] qemu-img: Plug memory leak in convert command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 15/17] block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 16/17] vmdk: Fix local_err in vmdk_create, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 17/17] qemu-img: Report error even with --oformat=json, Kevin Wolf, 2014/06/02