diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-17 20:15:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-07-17 14:37:02 +1000 |
| commit | ab76a3a3fc56cf8f530e5ab9b6389b09da1cdc12 (patch) | |
| tree | cd506873a481a36609af72492172a1980c167f62 /dix | |
| parent | 6bd9badc780ec9d1fb147dfa0c671979c75b722c (diff) | |
dix: always copy grabs, don't reference them
Introduced in xorg-server-1.13.99.901-2-g9ad0fdb. Storing the grab pointer
in the listener turns out to be a bad idea. If the grab is not an active
grab or an implicit grab, the pointer stored is the one to the grab attached
on the window. This grab may be removed if the client calls UngrabButton or
similar while the touch is still active, leaving a dangling pointer.
To avoid this, copy the grab wherever we need to reference it later. This
is also what we do for pointer/keyboard grabs, where we copy the grab as
soon as it becomes active.
Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 395124bd2782823de37e5c5b2f15dba49cff05f6)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 3 | ||||
| -rw-r--r-- | dix/touch.c | 19 |
2 files changed, 19 insertions, 3 deletions
diff --git a/dix/events.c b/dix/events.c index 6a8e7a64a..8745c1135 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1439,7 +1439,8 @@ UpdateTouchesForGrab(DeviceIntPtr mouse) listener->type = LISTENER_POINTER_GRAB; else listener->type = LISTENER_GRAB; - listener->grab = grab; + FreeGrab(listener->grab); + listener->grab = AllocGrab(grab); } } } diff --git a/dix/touch.c b/dix/touch.c index 01a554e0c..fb218d4b1 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -365,6 +365,8 @@ TouchBeginTouch(DeviceIntPtr dev, int sourceid, uint32_t touchid, void TouchEndTouch(DeviceIntPtr dev, TouchPointInfoPtr ti) { + int i; + if (ti->emulate_pointer) { GrabPtr grab; @@ -376,6 +378,9 @@ TouchEndTouch(DeviceIntPtr dev, TouchPointInfoPtr ti) } } + for (i = 0; i < ti->num_listeners; i++) + TouchRemoveListener(ti, ti->listeners[0].listener); + ti->active = FALSE; ti->pending_finish = FALSE; ti->sprite.spriteTraceGood = 0; @@ -692,15 +697,23 @@ void TouchAddListener(TouchPointInfoPtr ti, XID resource, int resource_type, enum InputLevel level, enum TouchListenerType type, enum TouchListenerState state, WindowPtr window, - GrabPtr grab) + const GrabPtr grab) { + GrabPtr g = NULL; + + /* We need a copy of the grab, not the grab itself since that may be + * deleted by a UngrabButton request and leaves us with a dangling + * pointer */ + if (grab) + g = AllocGrab(grab); + ti->listeners[ti->num_listeners].listener = resource; ti->listeners[ti->num_listeners].resource_type = resource_type; ti->listeners[ti->num_listeners].level = level; ti->listeners[ti->num_listeners].state = state; ti->listeners[ti->num_listeners].type = type; ti->listeners[ti->num_listeners].window = window; - ti->listeners[ti->num_listeners].grab = grab; + ti->listeners[ti->num_listeners].grab = g; if (grab) ti->num_grabs++; ti->num_listeners++; @@ -725,6 +738,7 @@ TouchRemoveListener(TouchPointInfoPtr ti, XID resource) continue; if (listener->grab) { + FreeGrab(listener->grab); listener->grab = NULL; ti->num_grabs--; } @@ -734,6 +748,7 @@ TouchRemoveListener(TouchPointInfoPtr ti, XID resource) ti->num_listeners--; ti->listeners[ti->num_listeners].listener = 0; ti->listeners[ti->num_listeners].state = LISTENER_AWAITING_BEGIN; + return TRUE; } return FALSE; |