summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2022-12-23 09:48:03 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2022-12-23 09:48:03 +0100
commit63a8cec1b120a747b2b72a49eed038f735119d02 (patch)
tree5f7e73b0815343d569237e093c0b688ee79fcc70
parentba663123669ae1a5670e4a85ce2cf520fea875f6 (diff)
parent23ec020dd515508f3d1bdae074b9fc0f4374ea22 (diff)
downloadNetworkManager-63a8cec1b120a747b2b72a49eed038f735119d02.tar.gz
merge: branch 'bg/coverity'
Fix some coverity warnings. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1487 (cherry picked from commit 5fe4be6c06b2bcab77741fd77c78be8824bda5a5)
-rw-r--r--src/nmcli/devices.c5
-rw-r--r--src/nmtui/nmt-device-entry.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 9b7ebce39b..db14ec05ae 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -1149,7 +1149,7 @@ get_device_list(NmCli *nmc, int *argc, const char *const **argv)
if (*argc == 0) {
g_string_printf(nmc->return_text, _("Error: No interface specified."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
- goto error;
+ return NULL;
}
devices = nmc_get_devices_sorted(nmc->client);
@@ -1190,9 +1190,6 @@ get_device_list(NmCli *nmc, int *argc, const char *const **argv)
}
g_free(devices);
-error:
- g_strfreev(arg_arr);
-
return queue;
}
diff --git a/src/nmtui/nmt-device-entry.c b/src/nmtui/nmt-device-entry.c
index 7f312bd1fc..99cc43add3 100644
--- a/src/nmtui/nmt-device-entry.c
+++ b/src/nmtui/nmt-device-entry.c
@@ -132,12 +132,14 @@ device_entry_parse(NmtDeviceEntry *deventry,
&& (!words[1] || nm_utils_ifname_valid_kernel(words[1], NULL))) {
*mac_address = words[0];
*interface_name = NULL;
+ g_free(words[1]);
g_free(words);
return TRUE;
} else if (nm_utils_ifname_valid_kernel(words[0], NULL)
&& (!words[1] || nm_utils_hwaddr_aton(words[1], buf, len))) {
*interface_name = words[0];
*mac_address = NULL;
+ g_free(words[1]);
g_free(words);
return TRUE;
}