diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-04-15 16:54:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-05-02 15:20:30 +0200 |
| commit | 9ef23947cc8f074767bd63b984b73740766377b0 (patch) | |
| tree | 7bd002b553b5922a63eec86d4faa13f45c0402e7 /libnm-util | |
| parent | 981e33b83b57377d04fa6caa50a4434c59fb9285 (diff) | |
| download | NetworkManager-9ef23947cc8f074767bd63b984b73740766377b0.tar.gz | |
all: fix various warnings detected with coverity
https://bugzilla.gnome.org/show_bug.cgi?id=728320
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/crypto_nss.c | 7 | ||||
| -rw-r--r-- | libnm-util/nm-setting-ip4-config.c | 4 | ||||
| -rw-r--r-- | libnm-util/nm-setting-ip6-config.c | 4 |
3 files changed, 2 insertions, 13 deletions
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index 10a510c61c..ac060ce2d4 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -402,11 +402,8 @@ out: if (slot) PK11_FreeSlot (slot); - if (padded_buf) { - memset (padded_buf, 0, padded_buf_len); - g_free (padded_buf); - padded_buf = NULL; - } + memset (padded_buf, 0, padded_buf_len); + g_free (padded_buf); if (!success) { memset (output, 0, output_len); diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index d6574ca659..9e7e8204cc 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -492,8 +492,6 @@ nm_setting_ip4_config_add_address_with_label (NMSettingIP4Config *setting, } copy = nm_ip4_address_dup (address); - g_return_val_if_fail (copy != NULL, FALSE); - priv->addresses = g_slist_append (priv->addresses, copy); priv->address_labels = g_slist_append (priv->address_labels, g_strdup (label)); @@ -645,8 +643,6 @@ nm_setting_ip4_config_add_route (NMSettingIP4Config *setting, } copy = nm_ip4_route_dup (route); - g_return_val_if_fail (copy != NULL, FALSE); - priv->routes = g_slist_append (priv->routes, copy); g_object_notify (G_OBJECT (setting), NM_SETTING_IP4_CONFIG_ROUTES); return TRUE; diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index d8aa818664..721d69b2c1 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -490,8 +490,6 @@ nm_setting_ip6_config_add_address (NMSettingIP6Config *setting, } copy = nm_ip6_address_dup (address); - g_return_val_if_fail (copy != NULL, FALSE); - priv->addresses = g_slist_append (priv->addresses, copy); g_object_notify (G_OBJECT (setting), NM_SETTING_IP6_CONFIG_ADDRESSES); return TRUE; @@ -633,8 +631,6 @@ nm_setting_ip6_config_add_route (NMSettingIP6Config *setting, } copy = nm_ip6_route_dup (route); - g_return_val_if_fail (copy != NULL, FALSE); - priv->routes = g_slist_append (priv->routes, copy); g_object_notify (G_OBJECT (setting), NM_SETTING_IP6_CONFIG_ROUTES); return TRUE; |