debian/changelog | 7 +++++
debian/patches/611-Fix-touch-punt-crash.patch | 31 ++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 39 insertions(+)
New commits:
commit 371162b8b073698e2d852a083702e17a420899c7
Author: Chase Douglas <chase.doug...@ubuntu.com>
Date: Mon Feb 13 12:10:08 2012 -0800
releasing version 2:1.11.4-0ubuntu2
diff --git a/debian/changelog b/debian/changelog
index a0204ab..548eba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.11.4-0ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.11.4-0ubuntu2) precise; urgency=low
* Fix crash when punting a touch to a non-existent owner
- Add 611-Fix-touch-punt-crash.patch
- -- Chase Douglas <chase.doug...@ubuntu.com> Mon, 13 Feb 2012 11:59:40 -0800
+ -- Chase Douglas <chase.doug...@ubuntu.com> Mon, 13 Feb 2012 12:10:02 -0800
xorg-server (2:1.11.4-0ubuntu1) precise; urgency=low
commit cf2d155fe7a19acc5c9b9092f318b6ae3c420317
Author: Chase Douglas <chase.doug...@ubuntu.com>
Date: Mon Feb 13 12:00:21 2012 -0800
Fix crash when punting a touch to a non-existent owner
diff --git a/debian/changelog b/debian/changelog
index 0af4c20..a0204ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.11.4-0ubuntu2) UNRELEASED; urgency=low
+
+ * Fix crash when punting a touch to a non-existent owner
+ - Add 611-Fix-touch-punt-crash.patch
+
+ -- Chase Douglas <chase.doug...@ubuntu.com> Mon, 13 Feb 2012 11:59:40 -0800
+
xorg-server (2:1.11.4-0ubuntu1) precise; urgency=low
[ Chase Douglas ]
diff --git a/debian/patches/611-Fix-touch-punt-crash.patch
b/debian/patches/611-Fix-touch-punt-crash.patch
new file mode 100644
index 0000000..8b4bac2
--- /dev/null
+++ b/debian/patches/611-Fix-touch-punt-crash.patch
@@ -0,0 +1,31 @@
+From 832d940d28f506e2adcc9b678a315edbaec9d353 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.doug...@ubuntu.com>
+Date: Mon, 13 Feb 2012 11:55:57 -0800
+Subject: [PATCH] Don't dereference a touch after it has been ended when
+ punting to next owner
+
+In this case, we have ended the touch because the last owner has
+rejected it. We need to return from the function right now so we don't
+attempt to dereference another touch client for early acceptance
+processing.
+
+Signed-off-by: Chase Douglas <chase.doug...@ubuntu.com>
+---
+ Xi/exevents.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 1ecc3ba..9bc8dfb 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -1164,6 +1164,7 @@ TouchPuntToNextOwner(DeviceIntPtr dev, TouchPointInfoPtr
ti,
+ {
+ EmitTouchEnd(dev, ti, 0, 0);
+ TouchEndTouch(dev, ti);
++ return;
+ }
+
+ if (ti->listeners[0].state == LISTENER_EARLY_ACCEPT)
+--
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
index 21ded1e..3cf4757 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@
608-dix-fix-an-out-of-memory-crash.patch
609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
610-Fix-scrolling.patch
+611-Fix-touch-punt-crash.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rx2fq-0002vz...@vasks.debian.org
