diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-05-28 11:17:01 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-08-05 11:41:40 -0500 |
| commit | 5a0913f782a5d73a274b1fb39ec7d4d9a79ad4ca (patch) | |
| tree | 5c40919c9b5fdaa1b06dd7abdf14d3dd58b10188 /blockdev.c | |
| parent | 40a3fb54b29970a2c97dde39aa97b9201ad7a7cf (diff) | |
| download | qemu-5a0913f782a5d73a274b1fb39ec7d4d9a79ad4ca.tar.gz | |
blockdev: Plug memory leak in blockdev_init()
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 <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 6376f9522372d589f3efe60001dc0486237dd375)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/blockdev.c b/blockdev.c index fbfdc27987..b0ce4f0bf9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -332,7 +332,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); @@ -527,8 +527,9 @@ err: QTAILQ_REMOVE(&drives, dinfo, next); g_free(dinfo); early_err: - QDECREF(bs_opts); qemu_opts_del(opts); +err_no_opts: + QDECREF(bs_opts); return NULL; } |