Imported Debian patch 2:1.15.1-0ubuntu2.6

[deb_xorg-server.git] / debian / patches / xi2-resize-touch.patch

diff --git a/dix/touch.c b/dix/touch.c
index a7ea213..1478e38 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -460,12 +460,26 @@ TouchEventHistoryPush(TouchPointInfoPtr ti, const DeviceEvent *ev)
     if (ev->flags & (TOUCH_CLIENT_ID | TOUCH_REPLAYING))
         return;
 
+    if (ti->history_elements == ti->history_size - 1) {
+        DeviceEvent *hist = NULL;
+        size_t sz = ti->history_size * 2;
+
+        if (sz < 10000) {
+            hist = realloc(ti->history, sz * sizeof(*hist));
+
+            if (hist) {
+                ti->history = hist;
+                ti->history_size = sz;
+                memset(&hist[sz/2], 0, sizeof(*hist)*sz/2);
+            }
+        }
+    }
+
     ti->history[ti->history_elements++] = *ev;
-    /* FIXME: proper overflow fixes */
     if (ti->history_elements > ti->history_size - 1) {
         ti->history_elements = ti->history_size - 1;
-        DebugF("source device %d: history size %d overflowing for touch %u\n",
-               ti->sourceid, ti->history_size, ti->client_id);
+        ErrorF("source device %d: history size %d overflowing for touch %u\n",
+              ti->sourceid, ti->history_size, ti->client_id);
     }
 }