summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-08-02 08:33:32 +0200
committerThomas Haller <thaller@redhat.com>2019-08-02 08:33:36 +0200
commitec982ceb8ebc9a2f9c3ee14f89735bce818ee948 (patch)
treed2e3aab74216e733221e5bc7f011c785e0a9c705
parentbee0b20e3f04f93fe2ae906141c8973110b94667 (diff)
downloadNetworkManager-ec982ceb8ebc9a2f9c3ee14f89735bce818ee948.tar.gz
cli: fix dereferncing NULL pointer in parse_passwords() with empty file
Warned by coverity.
-rw-r--r--clients/cli/connections.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index c88fbd2abb..b8905cc78a 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -2711,7 +2711,6 @@ parse_passwords (const char *passwd_file, GError **error)
if (!passwd_file)
return g_steal_pointer (&pwds_hash);
- /* Read the passwords file */
if (!g_file_get_contents (passwd_file, &contents, &len, &local_err)) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("failed to read passwd-file '%s': %s"),
@@ -2721,7 +2720,7 @@ parse_passwords (const char *passwd_file, GError **error)
}
strv = nm_utils_strsplit_set (contents, "\r\n");
- for (iter = strv; *iter; iter++) {
+ for (iter = strv; strv && *iter; iter++) {
gs_free char *iter_s = g_strdup (*iter);
pwd = strchr (iter_s, ':');