Merge lp:~chasedouglas/geis/prevent_device_overrun into lp:geis

[Chase Douglas]

[lp:~chasedouglas/geis/prevent_device_overrun]

161. By Chase Douglas on 2011-08-29

Prevent overrun of devices array in xcb backend token

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend_token.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend_token.c	2011-07-25 14:02:47 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend_token.c	2011-08-29 17:51:04 +0000
@@ -434,8 +434,14 @@
   {
     GeisInteger device_id = *(GeisInteger*)value;
     geis_debug("attr name=\"%s\" value=%d", name, device_id);
-    t->devices[t->device_count++] = device_id;
-    status = GEIS_STATUS_SUCCESS;
+    if (t->device_count < MAX_NUM_DEVICES) {
+      t->devices[t->device_count++] = device_id;
+      status = GEIS_STATUS_SUCCESS;
+    }
+    else {
+      geis_warning("too many devices in xcb backend token");
+      status = GEIS_STATUS_UNKNOWN_ERROR;
+    }
   }
   else if (0 == strcmp(name, GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH)
            && op == GEIS_FILTER_OP_EQ)