diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-04-15 16:53:48 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-16 07:32:42 +1000 |
| commit | 98b94c36d6b1d286bbd4cb414e54b4b95a1484b0 (patch) | |
| tree | 58d170c737f56be7a1fa6c47d6a29e7aff4de173 /dix | |
| parent | 4bff442ec5aa4b93a3f5c11782d4b7b9d1ae13ac (diff) | |
dix: copy event in TouchConvertToPointerEvent correctly
Fixes reading random memory read beyond the end of original event.
sizeof device_event: 424
sizeof internal_event: 2800
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/touch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/touch.c b/dix/touch.c index 891cc7803..3027bbbf2 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -620,14 +620,14 @@ TouchConvertToPointerEvent(const InternalEvent *event, BUG_WARN_MSG(!(event->device_event.flags & TOUCH_POINTER_EMULATED), "Non-emulating touch event\n"); - *motion_event = *event; + motion_event->device_event = event->device_event; motion_event->any.type = ET_Motion; motion_event->device_event.detail.button = 0; motion_event->device_event.flags = XIPointerEmulated; if (nevents > 1) { BUG_RETURN_VAL(!button_event, 0); - *button_event = *event; + button_event->device_event = event->device_event; button_event->any.type = ptrtype; button_event->device_event.flags = XIPointerEmulated; /* detail is already correct */ |