diff options
| -rw-r--r-- | libnm-core/nm-setting-vlan.c | 3 | ||||
| -rw-r--r-- | libnm-core/nm-utils.c | 4 | ||||
| -rw-r--r-- | libnm-util/nm-setting-vlan.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 7b7ad91cf6..f622ddcbfd 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -223,7 +223,8 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting, list = get_map (setting, map); item = priority_map_new_from_str (map, str); - g_return_val_if_fail (item != NULL, FALSE); + if (!item) + g_return_val_if_reached (FALSE); /* Duplicates get replaced */ for (iter = list; iter; iter = g_slist_next (iter)) { diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 0f85e52a0e..4b284cfefd 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -2054,7 +2054,9 @@ nm_utils_rsa_key_encrypt (const guint8 *data, goto out; key = crypto_make_des_aes_key (CIPHER_DES_EDE3_CBC, &salt[0], salt_len, in_password, &key_len, NULL); - g_return_val_if_fail (key, NULL); + if (!key) + g_return_val_if_reached (NULL); + enc = crypto_encrypt (CIPHER_DES_EDE3_CBC, data, len, salt, salt_len, key, key_len, &enc_len, error); if (!enc) goto out; diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index f009629242..43b6a91c13 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -260,7 +260,8 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting, list = get_map (setting, map); item = priority_map_new_from_str (map, str); - g_return_val_if_fail (item != NULL, FALSE); + if (!item) + g_return_val_if_reached (FALSE); /* Duplicates get replaced */ for (iter = list; iter; iter = g_slist_next (iter)) { |