colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: fix dereferncing NULL pointer in parse_passwords() with empty file

Browse Source 
Warned by coverity.

(cherry picked from commit ec982ceb8e)
This commit is contained in:
Thomas Haller
2019-08-02 08:33:32 +02:00
parent ae1f6de899
commit 650c0cd622
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clients/cli/connections.c
View File

@@ -2711,7 +2711,6 @@ parse_passwords (const char *passwd_file, GError **error)
if (!passwd_file) if (!passwd_file)
return g_steal_pointer (&pwds_hash); return g_steal_pointer (&pwds_hash);
/* Read the passwords file */
if (!g_file_get_contents (passwd_file, &contents, &len, &local_err)) { if (!g_file_get_contents (passwd_file, &contents, &len, &local_err)) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("failed to read passwd-file '%s': %s"), _("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"); 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); gs_free char *iter_s = g_strdup (*iter);
pwd = strchr (iter_s, ':'); pwd = strchr (iter_s, ':');