Merge lp:~bregma/geis/lp-897976 into lp:geis

[Stephen M. Webb]

Fixes a race condition uncovered during utouch-evemu unit testing (LP: #897976).

[Chase Douglas (chasedouglas)]

Looks like the correct fix. I don't see how one could test this reliably, so I'm ok exempting it from needing a testcase.

review: Approve

[Jussi Pakkanen (jpakkane)]

Yes.

Besides, this is a fix to make failing unit tests pass, so there is an automated test case already.

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-10-13 19:26:04 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-12-07 20:57:59 +0000
@@ -478,12 +478,15 @@
 static void
 _report_xcb_devices(GeisXcbBackend be, int deviceid)
 {
-  XIDeviceInfo *devices;
-  int           device_index;
-  int           num_devices;
+  int num_devices;
+  XIDeviceInfo *devices = XIQueryDevice(be->x11_display, deviceid, &num_devices);
+  if (devices == NULL)
+  {
+    geis_warning("error retrieving device from XIQueryDevice()");
+    return;
+  }
 
-  devices = XIQueryDevice(be->x11_display, deviceid, &num_devices);
-  for (device_index = 0; device_index < num_devices; ++device_index)
+  for (int device_index = 0; device_index < num_devices; ++device_index)
   {
     int class_index;
     for (class_index = 0;