Skip to content

Commit

Permalink
blockdev: Plug memory leak in drive_init()
Browse files Browse the repository at this point in the history
bs_opts is leaked on all paths from its qdev_new() that don't got
through blockdev_init().  Add the missing QDECREF(), and zap bs_opts
after blockdev_init(), so the new QDECREF() does nothing when we go
through blockdev_init().

Leak introduced in commit f298d07.  Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
Markus Armbruster authored and kevmw committed May 30, 2014
1 parent 6376f95 commit 3cb0e25
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions blockdev.c
Expand Up @@ -940,6 +940,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

/* Actual block device init: Functionality shared with blockdev-add */
dinfo = blockdev_init(filename, bs_opts, &local_err);
bs_opts = NULL;
if (dinfo == NULL) {
if (local_err) {
error_report("%s", error_get_pretty(local_err));
Expand Down Expand Up @@ -977,6 +978,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

fail:
qemu_opts_del(legacy_opts);
QDECREF(bs_opts);
return dinfo;
}

Expand Down

0 comments on commit 3cb0e25

Please sign in to comment.