commit 3cb0e25c4b417b7336816bd92de458f0770d49ff
author Markus Armbruster <armbru@redhat.com> Wed May 28 11:17:02 2014 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri May 30 14:26:54 2014 +0200
tree ca8a96057a4ced591ca22039249f977967a838e2
parent 6376f9522372d589f3efe60001dc0486237dd375

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

blockdev.c

diff --git a/blockdev.c b/blockdev.c
index 652a052..9b5261b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -940,6 +940,7 @@
 
     /* 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 @@
 
 fail:
     qemu_opts_del(legacy_opts);
+    QDECREF(bs_opts);
     return dinfo;
 }