Commit 3cb0e25c authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

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 f298d071.  Spotted by Coverity.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 6376f952

blockdev.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}