xorg-server: Changes to 'ubuntu'
debian/changelog | 2 ++
debian/patches/233-xf86events-valgrind.patch | 17 +++++++++++++++++
debian/patches/series | 1 +
3 files changed, 20 insertions(+)
New commits:
commit c9f3e5b0c6a1ce6debce03a9e98c8751ba52c3c9
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 8 12:44:43 2012 +0200
add 233-xf86events-valgrind.patch to fix a xserver corruption when acpid is stopped before Xorg is.
diff --git a/debian/changelog b/debian/changelog
index 0c356d9..c1c8263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.13.0-0ubuntu6) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* add 232-xf86compatoutput-valgrind.patch to silence a valgrind error
+ * add 233-xf86events-valgrind.patch to fix a xserver corruption
+ when acpid is stopped before Xorg is.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 01 Oct 2012 09:29:29 +0300
diff --git a/debian/patches/233-xf86events-valgrind.patch b/debian/patches/233-xf86events-valgrind.patch
new file mode 100644
index 0000000..d4e2f83
--- /dev/null
+++ b/debian/patches/233-xf86events-valgrind.patch
@@ -0,0 +1,17 @@
+diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
+index 3ad34b5..98ee8cd 100644
+--- a/hw/xfree86/common/xf86Events.c
++++ b/hw/xfree86/common/xf86Events.c
+@@ -271,9 +271,10 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
+ }
+
+ if (err >= 0) { /* we don't want the handlers called if select() */
+- IHPtr ih; /* returned with an error condition, do we? */
++ IHPtr ih, ih_next; /* returned with an error condition, do we? */
+
+- for (ih = InputHandlers; ih; ih = ih->next) {
++ for (ih = InputHandlers; ih; ih = ih_next) {
++ ih_next = ih->next;
+ if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
+ (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
+ ih->ihproc(ih->fd, ih->data);
diff --git a/debian/patches/series b/debian/patches/series
index b81784e..ba431fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
208_switch_on_release.diff
227_null_ptr_midispcur.patch
232-xf86compatoutput-valgrind.patch
+233-xf86events-valgrind.patch
## waiting for review by upstream
111_armel-drv-fallbacks.patch
Reply to: