[network-manager-applet] applet: remove assert(s_con) from applet_get_active_vpn_connection()
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] applet: remove assert(s_con) from applet_get_active_vpn_connection()
- Date: Fri, 13 May 2016 16:48:21 +0000 (UTC)
commit c3255ed740592a2f23a7ebc47f1acd2dd2d768b3
Author: Thomas Haller <thaller redhat com>
Date: Fri May 13 18:22:01 2016 +0200
applet: remove assert(s_con) from applet_get_active_vpn_connection()
This assertion is just to strict. On client side, we cannot expect that
all connections that NetworkManager exposes are valid.
In libnm/libnm-glib there was an old bug, that connections which don't verify
could be completely bogus and thus hit this assertion. This got fixed by
https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=23136ecf89f279479337ead355b7ff5e80465a0b
and with a fixed libnm/libnm-glib, we would always expect that a
connection has at least a NMSettingConnection instance.
Nonetheless, there is no reason to enforce that with an assert.
This was already fixed before by 22468c05291d3d88ddc68f8983bffe54f29f5f82
and reverted again by c86d66632ad76aa4a93593a07a9b4e25f18efbf7.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815668
https://bugzilla.redhat.com/show_bug.cgi?id=1313866
https://bugzilla.redhat.com/show_bug.cgi?id=1314650
https://bugzilla.gnome.org/show_bug.cgi?id=765830
src/applet.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/applet.c b/src/applet.c
index 72ac5c9..fc87815 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -1112,7 +1112,8 @@ applet_get_active_vpn_connection (NMApplet *applet,
continue;
s_con = nm_connection_get_setting_connection (connection);
- g_assert (s_con);
+ if (!s_con)
+ continue;
if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME))
{
ret = candidate;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]