NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Do not free disk definitions on cleanup

Browse Source 
Both vboxSnapshotGetReadWriteDisks and vboxSnapshotGetReadWriteDisks do
not need to free the def->disks on cleanup because it's being done by
the caller via virDomainSnaphotDefFree
This commit is contained in:
Dawid Zamirski 2017-11-07 13:49:23 -05:00 committed by John Ferlan
parent 60c519ee24
commit 03a24da4c4
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vbox/vbox_common.c
View File

@ -5883,13 +5883,8 @@ vboxSnapshotGetReadWriteDisks(virDomainSnapshotDefPtr def,
ret = 0; ret = 0;
cleanup: cleanup:
if (ret < 0) {
for (i = 0; i < def->ndisks; i++)
VIR_FREE(def->disks[i].src);
VIR_FREE(def->disks);
def->ndisks = 0;
}
VBOX_RELEASE(snap); VBOX_RELEASE(snap);
return ret; return ret;
} }
@ -6105,16 +6100,11 @@ vboxSnapshotGetReadOnlyDisks(virDomainSnapshotPtr snapshot,
ret = 0; ret = 0;
cleanup: cleanup:
if (ret < 0) {
for (i = 0; i < def->dom->ndisks; i++)
virDomainDiskDefFree(def->dom->disks[i]);
VIR_FREE(def->dom->disks);
def->dom->ndisks = 0;
}
VBOX_RELEASE(disk); VBOX_RELEASE(disk);
VBOX_RELEASE(storageController); VBOX_RELEASE(storageController);
gVBoxAPI.UArray.vboxArrayRelease(&mediumAttachments); gVBoxAPI.UArray.vboxArrayRelease(&mediumAttachments);
VBOX_RELEASE(snap); VBOX_RELEASE(snap);
return ret; return ret;
} }