47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 22468c05291d3d88ddc68f8983bffe54f29f5f82 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Haller <thaller@redhat.com>
|
|
Date: Fri, 4 Mar 2016 11:03:57 +0100
|
|
Subject: [PATCH] applet: workaround crash in applet code
|
|
|
|
rh#1313866 and rh#1314650 show a crash due to "g_assert (s_con)".
|
|
It's unclear how this can happen, but for now downgrade the crash
|
|
to a warning.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1313866
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1314650
|
|
---
|
|
src/applet.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/applet.c b/src/applet.c
|
|
index 7ba7744..85f535c 100644
|
|
--- a/src/applet.c
|
|
+++ b/src/applet.c
|
|
@@ -1082,7 +1082,6 @@ applet_get_first_active_vpn_connection (NMApplet *applet,
|
|
for (i = 0; active_list && (i < active_list->len); i++) {
|
|
NMActiveConnection *candidate;
|
|
NMConnection *connection;
|
|
- NMSettingConnection *s_con;
|
|
|
|
candidate = g_ptr_array_index (active_list, i);
|
|
|
|
@@ -1090,10 +1089,12 @@ applet_get_first_active_vpn_connection (NMApplet *applet,
|
|
if (!connection)
|
|
continue;
|
|
|
|
- s_con = nm_connection_get_setting_connection (connection);
|
|
- g_assert (s_con);
|
|
+ /* FIXME: rh#1313866 crashed on the following invariants for unknown reasons.
|
|
+ * Downgrade crash to warning. */
|
|
+ g_warn_if_fail (NM_IS_CONNECTION (connection));
|
|
+ g_warn_if_fail (NM_IS_SETTING (nm_connection_get_setting_connection (connection)));
|
|
|
|
- if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME)) {
|
|
+ if (nm_streq0 (nm_connection_get_connection_type (connection), NM_SETTING_VPN_SETTING_NAME)) {
|
|
if (out_state)
|
|
*out_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (candidate));
|
|
return candidate;
|
|
--
|
|
2.5.0
|
|
|