diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-03-18 10:46:03 +0100 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-03-21 13:32:50 -0400 |
| commit | a3de4283eafbd025e7f1a7588eb9afaa465f6c03 (patch) | |
| tree | 239ea49bd985f347bf5e5c2f2998691130390ffc | |
| parent | f6e2b6528fc3109463e9f288236ddb644fcb094d (diff) | |
| download | NetworkManager-a3de4283eafbd025e7f1a7588eb9afaa465f6c03.tar.gz | |
tui: fix crashes in nmtui-connect (rh #1078281)
https://bugzilla.redhat.com/show_bug.cgi?id=1078281
| -rw-r--r-- | tui/nmt-connect-connection-list.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tui/nmt-connect-connection-list.c b/tui/nmt-connect-connection-list.c index 2c71242d72..54923ea541 100644 --- a/tui/nmt-connect-connection-list.c +++ b/tui/nmt-connect-connection-list.c @@ -351,7 +351,7 @@ static GSList * append_nmt_devices_for_virtual_devices (GSList *nmt_devices, GSList *connections) { - NmtConnectDevice *nmtdev; + NmtConnectDevice *nmtdev = NULL; GSList *iter; GHashTable *devices_by_name; char *name; @@ -368,12 +368,13 @@ append_nmt_devices_for_virtual_devices (GSList *nmt_devices, continue; name = nm_connection_get_virtual_device_description (conn); - nmtdev = g_hash_table_lookup (devices_by_name, name); + if (name) + nmtdev = g_hash_table_lookup (devices_by_name, name); if (nmtdev) g_free (name); else { nmtdev = g_slice_new0 (NmtConnectDevice); - nmtdev->name = name; + nmtdev->name = name ? name : g_strdup ("Unknown"); nmtdev->sort_order = sort_order; g_hash_table_insert (devices_by_name, nmtdev->name, nmtdev); @@ -450,7 +451,7 @@ connection_find_ac (NMConnection *conn, ac = acs->pdata[i]; ac_path = nm_active_connection_get_connection (ac); - if (!strcmp (path, ac_path)) + if (!g_strcmp0 (path, ac_path)) return ac; } |