|
 |
2ed9ff |
From d343cc6289583a7b0d929b82b740499ed588b1ab Mon Sep 17 00:00:00 2001
|
|
|
2ed9ff |
From: Matthias Clasen <mclasen@redhat.com>
|
|
|
2ed9ff |
Date: Mon, 10 Jun 2013 21:41:24 -0400
|
|
|
2ed9ff |
Subject: [PATCH] x11: trap errors when calling XIQueryDevice
|
|
|
2ed9ff |
|
|
|
2ed9ff |
Devices can disappear at any time, causing XIQueryDevice
|
|
|
2ed9ff |
to throw an error. At the same time, plug a memory leak.
|
|
|
2ed9ff |
|
|
|
2ed9ff |
https://bugzilla.gnome.org/show_bug.cgi?id=701974
|
|
|
2ed9ff |
---
|
|
|
2ed9ff |
clutter/x11/clutter-device-manager-xi2.c | 30 ++++++++++++++++++++++--------
|
|
|
2ed9ff |
1 file changed, 22 insertions(+), 8 deletions(-)
|
|
|
2ed9ff |
|
|
|
2ed9ff |
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
|
|
|
2ed9ff |
index 6a06cec..49ee212 100644
|
|
|
2ed9ff |
--- a/clutter/x11/clutter-device-manager-xi2.c
|
|
|
2ed9ff |
+++ b/clutter/x11/clutter-device-manager-xi2.c
|
|
|
2ed9ff |
@@ -408,10 +408,16 @@ translate_hierarchy_event (ClutterBackendX11 *backend_x11,
|
|
|
2ed9ff |
|
|
|
2ed9ff |
CLUTTER_NOTE (EVENT, "Hierarchy event: device enabled");
|
|
|
2ed9ff |
|
|
|
2ed9ff |
+ clutter_x11_trap_x_errors ();
|
|
|
2ed9ff |
info = XIQueryDevice (backend_x11->xdpy,
|
|
|
2ed9ff |
ev->info[i].deviceid,
|
|
|
2ed9ff |
&n_devices);
|
|
|
2ed9ff |
- add_device (manager_xi2, backend_x11, &info[0], FALSE);
|
|
|
2ed9ff |
+ clutter_x11_untrap_x_errors ();
|
|
|
2ed9ff |
+ if (info != NULL)
|
|
|
2ed9ff |
+ {
|
|
|
2ed9ff |
+ add_device (manager_xi2, backend_x11, &info[0], FALSE);
|
|
|
2ed9ff |
+ XIFreeDeviceInfo (info);
|
|
|
2ed9ff |
+ }
|
|
|
2ed9ff |
}
|
|
|
2ed9ff |
else if (ev->info[i].flags & XIDeviceDisabled)
|
|
|
2ed9ff |
{
|
|
|
2ed9ff |
@@ -448,16 +454,24 @@ translate_hierarchy_event (ClutterBackendX11 *backend_x11,
|
|
|
2ed9ff |
/* and attach the slave to the new master if needed */
|
|
|
2ed9ff |
if (ev->info[i].flags & XISlaveAttached)
|
|
|
2ed9ff |
{
|
|
|
2ed9ff |
+ clutter_x11_trap_x_errors ();
|
|
|
2ed9ff |
info = XIQueryDevice (backend_x11->xdpy,
|
|
|
2ed9ff |
ev->info[i].deviceid,
|
|
|
2ed9ff |
&n_devices);
|
|
|
2ed9ff |
- master = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
2ed9ff |
- GINT_TO_POINTER (info->attachment));
|
|
|
2ed9ff |
- _clutter_input_device_set_associated_device (slave, master);
|
|
|
2ed9ff |
- _clutter_input_device_add_slave (master, slave);
|
|
|
2ed9ff |
-
|
|
|
2ed9ff |
- send_changed = TRUE;
|
|
|
2ed9ff |
- XIFreeDeviceInfo (info);
|
|
|
2ed9ff |
+ clutter_x11_untrap_x_errors ();
|
|
|
2ed9ff |
+ if (info != NULL)
|
|
|
2ed9ff |
+ {
|
|
|
2ed9ff |
+ master = g_hash_table_lookup (manager_xi2->devices_by_id,
|
|
|
2ed9ff |
+ GINT_TO_POINTER (info->attachment));
|
|
|
2ed9ff |
+ if (master != NULL)
|
|
|
2ed9ff |
+ {
|
|
|
2ed9ff |
+ _clutter_input_device_set_associated_device (slave, master);
|
|
|
2ed9ff |
+ _clutter_input_device_add_slave (master, slave);
|
|
|
2ed9ff |
+
|
|
|
2ed9ff |
+ send_changed = TRUE;
|
|
|
2ed9ff |
+ }
|
|
|
2ed9ff |
+ XIFreeDeviceInfo (info);
|
|
|
2ed9ff |
+ }
|
|
|
2ed9ff |
}
|
|
|
2ed9ff |
|
|
|
2ed9ff |
if (send_changed)
|
|
|
2ed9ff |
--
|
|
|
2ed9ff |
1.8.3.1
|
|
|
2ed9ff |
|