External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Fix memory leak when looking up an non-existing domain by name

Browse Source 
In case an optional object cannot be found the lookup function is
left early and the cleanup code is not executed.

This pattern occurs in some other functions too.
This commit is contained in:
Matthias Bolte 2010-08-08 21:32:29 +02:00
parent 4303c91cc3
commit f688faceac
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/esx/esx_vi.c
View File

@ -2254,7 +2254,9 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid,
if (managedObjectReference == NULL) { if (managedObjectReference == NULL) {
if (occurrence == esxVI_Occurrence_OptionalItem) { if (occurrence == esxVI_Occurrence_OptionalItem) {
return 0; result = 0;
goto cleanup;
} else { } else {
ESX_VI_ERROR(VIR_ERR_NO_DOMAIN, ESX_VI_ERROR(VIR_ERR_NO_DOMAIN,
_("Could not find domain with UUID '%s'"), _("Could not find domain with UUID '%s'"),
@ -2327,7 +2329,9 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name,
if (*virtualMachine == NULL) { if (*virtualMachine == NULL) {
if (occurrence == esxVI_Occurrence_OptionalItem) { if (occurrence == esxVI_Occurrence_OptionalItem) {
return 0; result = 0;
goto cleanup;
} else { } else {
ESX_VI_ERROR(VIR_ERR_NO_DOMAIN, ESX_VI_ERROR(VIR_ERR_NO_DOMAIN,
_("Could not find domain with name '%s'"), name); _("Could not find domain with name '%s'"), name);
@ -2454,8 +2458,10 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name,
goto cleanup; goto cleanup;
} }
// Found datastore with matching name /* Found datastore with matching name */
goto success; result = 0;
goto cleanup;
} }
} }
@ -2465,7 +2471,6 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name,
goto cleanup; goto cleanup;
} }
success:
result = 0; result = 0;
cleanup: cleanup:
@ -2540,7 +2545,9 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx,
} }
/* Found datastore with matching mount path */ /* Found datastore with matching mount path */
goto success; result = 0;
goto cleanup;
} }
} }
} }
@ -2552,7 +2559,6 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx,
goto cleanup; goto cleanup;
} }
success:
result = 0; result = 0;
cleanup: cleanup:
@ -2890,7 +2896,9 @@ esxVI_LookupCurrentSnapshotTree
if (currentSnapshot == NULL) { if (currentSnapshot == NULL) {
if (occurrence == esxVI_Occurrence_OptionalItem) { if (occurrence == esxVI_Occurrence_OptionalItem) {
return 0; result = 0;
goto cleanup;
} else { } else {
ESX_VI_ERROR(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", ESX_VI_ERROR(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s",
_("Domain has no current snapshot")); _("Domain has no current snapshot"));