diff options
| author | Michael Biebl <biebl@debian.org> | 2017-10-12 23:27:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-10-12 23:28:28 +0200 |
| commit | 9a79a375e2af3e3b766a60e8cb21a60f8eb8674a (patch) | |
| tree | 5cc0936920cd949fc4284e0e05c3360d96fb63cf | |
| parent | f28411f941563e186ce52a1d1a4a606191c13b2c (diff) | |
manager: Disconnect from signals on the proxy when we're disposed
Fixes a segfault in manager_recheck_permissions() when unlocking.
| -rw-r--r-- | debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch b/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch new file mode 100644 index 00000000..a8fa4d81 --- /dev/null +++ b/debian/patches/manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch @@ -0,0 +1,27 @@ +From: Iain Lane <iain@orangesquash.org.uk> +Date: Wed, 20 Sep 2017 15:01:41 +0100 +Subject: manager: Disconnect from signals on the proxy when we're disposed + +We're calling a callback on a proxy after it has been disposed. We +should make sure to disconnect from it when we go away. + +https://bugzilla.gnome.org/show_bug.cgi?id=787897 +--- + libnm/nm-manager.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c +index d3df733..294b9de 100644 +--- a/libnm/nm-manager.c ++++ b/libnm/nm-manager.c +@@ -192,8 +192,8 @@ init_dbus (NMObject *object) + property_info); + + /* Permissions */ +- g_signal_connect (priv->proxy, "check-permissions", +- G_CALLBACK (manager_recheck_permissions), object); ++ g_signal_connect_object (priv->proxy, "check-permissions", ++ G_CALLBACK (manager_recheck_permissions), object, 0); + } + + static NMClientPermission diff --git a/debian/patches/series b/debian/patches/series index af39d871..06da6fec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch Fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch +manager-Disconnect-from-signals-on-the-proxy-when-we-re-d.patch |