OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

blockdev: Plug memory leak in drive_init() error paths

Browse Source 
Should have spotted this when doing commit 319ae529.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-02-08 15:12:39 +01:00 committed by Kevin Wolf
parent 2753d4a5fa
commit a9ae2bffea
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blockdev.c
View File

@ -526,7 +526,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
} else if (ro == 1) { } else if (ro == 1) {
if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) { if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) {
error_report("readonly not supported by this bus type"); 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) { if (ret < 0) {
error_report("could not open disk image %s: %s", error_report("could not open disk image %s: %s",
file, strerror(-ret)); file, strerror(-ret));
return NULL; goto err;
} }
if (bdrv_key_required(dinfo->bdrv)) if (bdrv_key_required(dinfo->bdrv))
autostart = 0; autostart = 0;
return dinfo; 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) void do_commit(Monitor *mon, const QDict *qdict)