From 2b12825faa62b176c4d533c4b77f9c34d2fe3443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 18 May 2011 14:53:57 +0200 Subject: [PATCH] core: fix crash while connecting with AddAndActivateConnection() and SSID is missing A network with hidden SSID can appear in gnome-shell indicator applet as entry. Clicking it can make NM crash if there is no SSID in wireless setting nor in AP. --- src/nm-device-wifi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 9258f77c27..b4c84b548a 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -1465,13 +1465,12 @@ real_complete_connection (NMDevice *device, */ if (!nm_ap_complete_connection (ap, connection, - is_manf_default_ssid (ssid), + ssid ? is_manf_default_ssid (ssid) : FALSE, error)) return FALSE; } - g_assert (ssid); - str_ssid = nm_utils_ssid_to_utf8 (ssid); + str_ssid = ssid ? nm_utils_ssid_to_utf8 (ssid) : g_strdup (_("")); format = g_strdup_printf ("%s %%d", str_ssid); nm_utils_complete_generic (connection,