openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vbox: Fix resource leak 

The @disk was allocated, filled in, and consumed on the normal path,
but for error/cleanup paths it would be leaked.  Rename to newHardDisk
and manage properly.

Found by Coverity

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Katerina Koukiou <kkoukiou@redhat.com>
This commit is contained in:
John Ferlan 2018-06-05 08:33:04 -04:00
parent b8844727c9
commit 6cfd49bd4f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vbox/vbox_common.c
View File

@ -4629,6 +4629,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
unsigned char snapshotUuid[VIR_UUID_BUFLEN]; unsigned char snapshotUuid[VIR_UUID_BUFLEN];
virVBoxSnapshotConfHardDiskPtr *hardDiskToOpen = NULL; virVBoxSnapshotConfHardDiskPtr *hardDiskToOpen = NULL;
size_t hardDiskToOpenSize = 0; size_t hardDiskToOpenSize = 0;
virVBoxSnapshotConfHardDiskPtr newHardDisk = NULL;
char **searchResultTab = NULL; char **searchResultTab = NULL;
ssize_t resultSize = 0; ssize_t resultSize = 0;
int it = 0; int it = 0;
@ -5236,7 +5237,6 @@ vboxSnapshotRedefine(virDomainPtr dom,
PRUnichar *newLocation = NULL; PRUnichar *newLocation = NULL;
char *newLocationUtf8 = NULL; char *newLocationUtf8 = NULL;
resultCodeUnion resultCode; resultCodeUnion resultCode;
virVBoxSnapshotConfHardDiskPtr disk = NULL;
char *uuid = NULL; char *uuid = NULL;
char *format = NULL; char *format = NULL;
char *tmp = NULL; char *tmp = NULL;
@ -5301,11 +5301,11 @@ vboxSnapshotRedefine(virDomainPtr dom,
} }
VBOX_RELEASE(progress); VBOX_RELEASE(progress);
/* /*
* The differential disk is created, we add it to the media registry and the * The differential newHardDisk is created, we add it to the
* machine storage controllers. * media registry and the machine storage controllers.
*/ */
if (VIR_ALLOC(disk) < 0) if (VIR_ALLOC(newHardDisk) < 0)
goto cleanup; goto cleanup;
rc = gVBoxAPI.UIMedium.GetId(newMedium, &iid); rc = gVBoxAPI.UIMedium.GetId(newMedium, &iid);
@ -5316,24 +5316,25 @@ vboxSnapshotRedefine(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
gVBoxAPI.UIID.vboxIIDToUtf8(data, &iid, &uuid); gVBoxAPI.UIID.vboxIIDToUtf8(data, &iid, &uuid);
disk->uuid = uuid; newHardDisk->uuid = uuid;
vboxIIDUnalloc(&iid); vboxIIDUnalloc(&iid);
if (VIR_STRDUP(disk->location, newLocationUtf8) < 0) if (VIR_STRDUP(newHardDisk->location, newLocationUtf8) < 0)
goto cleanup; goto cleanup;
rc = gVBoxAPI.UIMedium.GetFormat(newMedium, &formatUtf16); rc = gVBoxAPI.UIMedium.GetFormat(newMedium, &formatUtf16);
VBOX_UTF16_TO_UTF8(formatUtf16, &format); VBOX_UTF16_TO_UTF8(formatUtf16, &format);
disk->format = format; newHardDisk->format = format;
VBOX_UTF16_FREE(formatUtf16); VBOX_UTF16_FREE(formatUtf16);
if (virVBoxSnapshotConfAddHardDiskToMediaRegistry(disk, if (virVBoxSnapshotConfAddHardDiskToMediaRegistry(newHardDisk,
snapshotMachineDesc->mediaRegistry, snapshotMachineDesc->mediaRegistry,
parentUuid) < 0) { parentUuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to add hard disk to the media registry")); _("Unable to add hard disk to the media registry"));
goto cleanup; goto cleanup;
} }
newHardDisk = NULL; /* Consumed by above */
/*Adding the fake disk to the machine storage controllers*/ /*Adding the fake disk to the machine storage controllers*/
resultSize = virStringSearch(snapshotMachineDesc->storageController, resultSize = virStringSearch(snapshotMachineDesc->storageController,
@ -5348,7 +5349,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
tmp = virStringReplace(snapshotMachineDesc->storageController, tmp = virStringReplace(snapshotMachineDesc->storageController,
searchResultTab[it], searchResultTab[it],
disk->uuid); uuid);
VIR_FREE(snapshotMachineDesc->storageController); VIR_FREE(snapshotMachineDesc->storageController);
if (!tmp) if (!tmp)
goto cleanup; goto cleanup;
@ -5458,6 +5459,7 @@ vboxSnapshotRedefine(virDomainPtr dom,
virStringListFree(realReadOnlyDisksPath); virStringListFree(realReadOnlyDisksPath);
virStringListFree(realReadWriteDisksPath); virStringListFree(realReadWriteDisksPath);
virStringListFree(searchResultTab); virStringListFree(searchResultTab);
virVboxSnapshotConfHardDiskFree(newHardDisk);
VIR_FREE(hardDiskToOpen); VIR_FREE(hardDiskToOpen);
VIR_FREE(newSnapshotPtr); VIR_FREE(newSnapshotPtr);
VIR_FREE(machineLocationPath); VIR_FREE(machineLocationPath);