merge: branch 'bg/coverity'

Fix some coverity warnings.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1487

4 files changed, 5 insertions, 7 deletions

diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index 40bd3f8eec..ac7e97f0c2 100644
--- a/src/core/devices/nm-lldp-listener.c
+++ b/src/core/devices/nm-lldp-listener.c
@@ -908,8 +908,7 @@ nm_lldp_listener_new(int                  ifindex,
     return self;
 
 fail:
-    if (self)
-        nm_g_slice_free(self);
+    nm_g_slice_free(self);
     return NULL;
 }
 
diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c
index f978e0e581..e510685b01 100644
--- a/src/libnm-platform/nmp-object.c
+++ b/src/libnm-platform/nmp-object.c
@@ -926,7 +926,7 @@ nmp_object_to_string(const NMPObject      *obj,
 
     switch (to_string_mode) {
     case NMP_OBJECT_TO_STRING_ID:
-        if (!klass->cmd_plobj_to_string_id)
+        if (klass->cmd_plobj_to_string_id)
             return klass->cmd_plobj_to_string_id(&obj->object, buf, buf_size);
         g_snprintf(buf, buf_size, NM_HASH_OBFUSCATE_PTR_FMT, NM_HASH_OBFUSCATE_PTR(obj));
         return buf;
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 20e69b00a2..f71a7d036d 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;
     }