From: Markus Armbruster Date: Wed, 28 May 2014 09:17:02 +0000 (+0200) Subject: blockdev: Plug memory leak in drive_init() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3cb0e25c4b417b7336816bd92de458f0770d49ff;p=qemu.git blockdev: Plug memory leak in drive_init() 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 Signed-off-by: Kevin Wolf --- diff --git a/blockdev.c b/blockdev.c index 652a0523b8..9b5261b765 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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)); @@ -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; }