diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-05-02 15:59:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-05-02 17:37:45 +0200 |
| commit | eeab435076d85b23c38c68112e751455b3f854da (patch) | |
| tree | e1f0a85f011f6e2f2eeae8b86790fefdc29e067a | |
| parent | 20116425fba2afdb6632574656ff8fde38dcbd28 (diff) | |
| download | NetworkManager-th/bg728320_coverity.tar.gz | |
fixup! all: fix various warnings detected with coverityth/bg728320_coverity
| -rw-r--r-- | libnm-util/crypto_nss.c | 3 | ||||
| -rw-r--r-- | libnm-util/nm-setting-vlan.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index a1098fc87a..40d4c7eee6 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -333,8 +333,7 @@ crypto_encrypt (const char *cipher, */ pad_len = iv_len - (data->len % iv_len); output_len = padded_buf_len = data->len + pad_len; - padded_buf = g_malloc0 (padded_buf_len); - g_assert (padded_buf); + padded_buf = g_malloc0 (MAX (padded_buf_len, 1)); memcpy (padded_buf, data->data, data->len); for (i = 0; i < pad_len; i++) diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index c2961f85a0..1cdfc7ab82 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -260,9 +260,10 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting, list = get_map (setting, map); item = priority_map_new_from_str (map, str); - - /* coverity[leaked_storage] */ - g_return_val_if_fail (item != NULL, FALSE); + if (!item) { + g_return_val_if_reached (FALSE); + return FALSE; + } /* Duplicates get replaced */ for (iter = list; iter; iter = g_slist_next (iter)) { |