Re: [PATCH 45/55] hyperv: use GLib auto-cleanup in hypervMsvmVSMSAddResourceSettings and hypervMsvmVSMSModifyResourceSettings

Fixes a memory leak when hypervCreateInvokeParamsList() fails. Signed-off-by: Matt Coleman <matt(a)datto.com&gt; --- src/hyperv/hyperv_wmi.c | 43 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index bd62174739..ed0091ba06 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1545,18 +1545,19 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domain, hypervWmiClassInfoPtr wmiInfo, WsXmlDocH *response) { - int result = -1; hypervPrivate *priv = domain->conn->privateData; char uuid_string[VIR_UUID_STRING_BUFLEN]; - Msvm_VirtualSystemSettingData *vssd = NULL; - GHashTable *resourceSettings = *resourceSettingsPtr; + g_autoptr(Msvm_VirtualSystemSettingData) vssd = NULL; + g_autoptr(GHashTable) resourceSettings = *resourceSettingsPtr; g_autoptr(hypervInvokeParamsList) params = NULL; g_auto(virBuffer) eprQuery = VIR_BUFFER_INITIALIZER; + *resourceSettingsPtr = NULL;

+ virUUIDFormat(domain->uuid, uuid_string); if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string, &vssd) < 0) - goto cleanup; + return -1; virBufferEscapeSQL(&eprQuery, MSVM_VIRTUALSYSTEMSETTINGDATA_WQL_SELECT "WHERE InstanceID='%s'", @@ -1567,27 +1568,21 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domain, Msvm_VirtualSystemManagementService_WmiInfo); if (!params) - goto cleanup; + return -1; if (hypervAddEprParam(params, "AffectedConfiguration", &eprQuery, Msvm_VirtualSystemSettingData_WmiInfo) < 0) - goto cleanup; + return -1; if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo) < 0) { hypervFreeEmbeddedParam(resourceSettings); - goto cleanup; + return -1; } if (hypervInvokeMethod(priv, &params, response) < 0) - goto cleanup; - - result = 0; - - cleanup: - hypervFreeObject((hypervObject *)vssd); - *resourceSettingsPtr = NULL; + return -1; - return result; + return 0; } @@ -1596,29 +1591,25 @@ hypervMsvmVSMSModifyResourceSettings(hypervPrivate *priv, GHashTable **resourceSettingsPtr, hypervWmiClassInfoPtr wmiInfo) { - int result = -1; - GHashTable *resourceSettings = *resourceSettingsPtr; + g_autoptr(GHashTable) resourceSettings = *resourceSettingsPtr; g_autoptr(hypervInvokeParamsList) params = NULL; + *resourceSettingsPtr = NULL; + params = hypervCreateInvokeParamsList("ModifyResourceSettings", MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR, Msvm_VirtualSystemManagementService_WmiInfo); if (!params) - goto cleanup; + return -1; if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo) < 0) { hypervFreeEmbeddedParam(resourceSettings); - goto cleanup; + return -1; } if (hypervInvokeMethod(priv, &params, NULL) < 0) - goto cleanup; - - result = 0; - - cleanup: - *resourceSettingsPtr = NULL; + return -1; - return result; + return 0; }