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

tui: fix crashes in nmtui-connect (rh #1078281)

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1078281
This commit is contained in:
Jiří Klimeš
2014-03-18 10:46:03 +01:00
committed by Dan Winship
parent f6e2b6528f
commit a3de4283ea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tui/nmt-connect-connection-list.c
View File

@@ -351,7 +351,7 @@ static GSList *
append_nmt_devices_for_virtual_devices (GSList *nmt_devices, append_nmt_devices_for_virtual_devices (GSList *nmt_devices,
GSList *connections) GSList *connections)
{ {
NmtConnectDevice *nmtdev; NmtConnectDevice *nmtdev = NULL;
GSList *iter; GSList *iter;
GHashTable *devices_by_name; GHashTable *devices_by_name;
char *name; char *name;
@@ -368,12 +368,13 @@ append_nmt_devices_for_virtual_devices (GSList *nmt_devices,
continue; continue;
name = nm_connection_get_virtual_device_description (conn); name = nm_connection_get_virtual_device_description (conn);
if (name)
nmtdev = g_hash_table_lookup (devices_by_name, name); nmtdev = g_hash_table_lookup (devices_by_name, name);
if (nmtdev) if (nmtdev)
g_free (name); g_free (name);
else { else {
nmtdev = g_slice_new0 (NmtConnectDevice); nmtdev = g_slice_new0 (NmtConnectDevice);
nmtdev->name = name; nmtdev->name = name ? name : g_strdup ("Unknown");
nmtdev->sort_order = sort_order; nmtdev->sort_order = sort_order;
g_hash_table_insert (devices_by_name, nmtdev->name, nmtdev); g_hash_table_insert (devices_by_name, nmtdev->name, nmtdev);
@@ -450,7 +451,7 @@ connection_find_ac (NMConnection *conn,
ac = acs->pdata[i]; ac = acs->pdata[i];
ac_path = nm_active_connection_get_connection (ac); ac_path = nm_active_connection_get_connection (ac);
if (!strcmp (path, ac_path)) if (!g_strcmp0 (path, ac_path))
return ac; return ac;
} }