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

blockdev: Plug memory leak in drive_init() error paths 



Should have spotted this when doing commit 319ae529.

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

blockdev.c

+9 −2
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) 
    } else if (ro == 1) {

        if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) {

            error_report("readonly not supported by this bus type");

            return NULL;

            goto err;

        }

    }
@@ -536,12 +536,19 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) 
    if (ret < 0) {

        error_report("could not open disk image %s: %s",

                     file, strerror(-ret));

        return NULL;

        goto err;

    }



    if (bdrv_key_required(dinfo->bdrv))

        autostart = 0;

    return dinfo;



err:

    bdrv_delete(dinfo->bdrv);

    qemu_free(dinfo->id);

    QTAILQ_REMOVE(&drives, dinfo, next);

    qemu_free(dinfo);

    return NULL;

}



void do_commit(Monitor *mon, const QDict *qdict)