Merge branch 'device-deregister' into 'master'

Fix use-after-free when a device listener is destroyed

Closes #22

See merge request GNOME/at-spi2-core!29

1 files changed, 3 insertions, 1 deletions

diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c
index 8e04c417..0d5ff35e 100644
--- a/atspi/atspi-device-listener.c
+++ b/atspi/atspi-device-listener.c
@@ -177,7 +177,9 @@ atspi_device_listener_finalize (GObject *object)
 {
   AtspiDeviceListener *listener = (AtspiDeviceListener *) object;
   GList *l;
-  
+
+  device_listeners = g_list_remove (device_listeners, listener);
+
   for (l = listener->callbacks; l; l = l->next)
     {
       device_event_handler_free (l->data);