xorg-server: Changes to 'ubuntu'
debian/changelog | 7 ++++++
debian/patches/510_fix_touchpad_touch_event_removal.patch | 16 ++++++++++++++
debian/patches/series | 1
3 files changed, 24 insertions(+)
New commits:
commit f62161d713ab1361cf090a4408342366adf3ec4b
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Tue Oct 18 17:18:33 2011 -0700
Fix crash on accepting a touch grab from an indirect device (LP: #877825)
* Fix crash on accepting a touch grab from an indirect device (LP: #877825)
- Added 510_fix_touchpad_touch_event_removal.patch
diff --git a/debian/changelog b/debian/changelog
index 6de56a2..1270348 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.4-1ubuntu4.2) oneiric-proposed; urgency=low
+
+ * Fix crash on accepting a touch grab from an indirect device (LP: #877825)
+ - Added 510_fix_touchpad_touch_event_removal.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 18 Oct 2011 17:33:31 -0700
+
xorg-server (2:1.10.4-1ubuntu4.1) oneiric-security; urgency=low
* SECURITY UPDATE: file existence disclosure
diff --git a/debian/patches/510_fix_touchpad_touch_event_removal.patch b/debian/patches/510_fix_touchpad_touch_event_removal.patch
new file mode 100644
index 0000000..6b16b65
--- /dev/null
+++ b/debian/patches/510_fix_touchpad_touch_event_removal.patch
@@ -0,0 +1,16 @@
+--- a/dix/events.c
++++ b/dix/events.c
+@@ -1327,11 +1327,11 @@ RemoveTouchEventsFromQueue(DeviceIntPtr
+ dev->deviceGrab.sync.event = malloc(sizeof(DeviceEvent));
+ memcpy(dev->deviceGrab.sync.event, first->event,
+ sizeof(DeviceEvent));
++ syncEvents.pending = first->next;
++ free(first);
+ }
+ else
+ dev->deviceGrab.sync.event = NULL;
+- syncEvents.pending = first->next;
+- free(first);
+ if (!syncEvents.pending)
+ syncEvents.pendtail = NULL;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e7044e5..f2f3289 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@
507_touch_grab_reject_send_ownership.patch
508_CVE-2011-4028.patch
509_CVE-2011-4029.patch
+510_fix_touchpad_touch_event_removal.patch
Reply to: