diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-06-05 15:17:08 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-06-11 16:44:06 +0200 |
| commit | 6a3bb90ad4f6e4876faa46fb02bca0c7801fb30b (patch) | |
| tree | 70d24924ccbc3e75352f56e042f18a08001e596a /clients | |
| parent | 32c6c0cdaf33c7169daa0c703ec26ea86e235db2 (diff) | |
| download | NetworkManager-6a3bb90ad4f6e4876faa46fb02bca0c7801fb30b.tar.gz | |
cli: fix crash on autocompletion
@connections is NULL when doing autocompletion. Fixes the following:
$ nmcli --complete-args con monitor ""
help
id
uuid
path
filename
...
Segmentation fault (core dumped)
Fixes: 4b3297271e6f ('cli: rework connection handling for multiple results')
https://bugzilla.redhat.com/show_bug.cgi?id=1716948
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/177
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/connections.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index c7230f5c69..1ca84ba575 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -8741,6 +8741,9 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv) } } + if (nmc->complete) + return nmc->return_value; + for (i = 0; i < connections->len; i++) connection_watch (nmc, connections->pdata[i]); @@ -8750,8 +8753,6 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv) g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_ADDED, G_CALLBACK (connection_added), nmc); } - if (nmc->complete) - return nmc->return_value; g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_REMOVED, G_CALLBACK (connection_removed), nmc); return NMC_RESULT_SUCCESS; |