From 70bd552e67936ce990ed6d319e288b7d90959276 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Wed, 11 Jun 2014 09:14:50 -0400 Subject: [PATCH] vbox_temp: Resolve Coverity warnings Clean up code to resolve Coverity RESOURCE_LEAK's from commit id's '632b9600' and 'b739f807'. --- src/vbox/vbox_tmpl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index da9b2b740d..1ed2729070 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -6267,6 +6267,11 @@ vboxSnapshotRedefine(virDomainPtr dom, */ parentUuid = virVBoxSnapshotConfHardDiskUuidByLocation(snapshotMachineDesc, realReadOnlyDisksPath[it]); + if (parentUuid == NULL) { + VIR_FREE(readWriteDisk); + goto cleanup; + } + if (virVBoxSnapshotConfAddHardDiskToMediaRegistry(readWriteDisk, snapshotMachineDesc->mediaRegistry, parentUuid) < 0) { @@ -8576,14 +8581,17 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get medium uuid, rc=%08x"), (unsigned)rc); + VIR_FREE(disk); goto cleanup; } VBOX_UTF16_TO_UTF8(uuidUtf16, &uuid); disk->uuid = uuid; VBOX_UTF16_FREE(uuidUtf16); - if (VIR_STRDUP(disk->location, newLocationUtf8) < 0) + if (VIR_STRDUP(disk->location, newLocationUtf8) < 0) { + VIR_FREE(disk); goto cleanup; + } rc = newMedium->vtbl->GetFormat(newMedium, &formatUtf16); VBOX_UTF16_TO_UTF8(formatUtf16, &format); -- GitLab