xorg-server: Changes to 'debian-experimental'
debian/changelog | 8 +++
debian/patches/17-fix-DRI2-segfault-when-clientGone.diff | 33 +++++++++++++++
debian/patches/series | 1
3 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 18f1195e801e3598e4eafdb712cf3ce65e61b759
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jun 18 14:38:09 2010 +1000
Add fix for server crash in DRI2 (FDO bug: #27497)
diff --git a/debian/changelog b/debian/changelog
index acd7a14..62666cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
xorg-server (2:1.8.1.901-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Install the upstream changelog in xserver-common, instead of duplicating
its 1MB in all other packages.
- -- Julien Cristau <jcristau@debian.org> Tue, 08 Jun 2010 00:19:42 +0200
+ [ Christopher James Halse Rogers ]
+ * 17-fix-DRI2-segfault-when-clientGone.diff:
+ - Pick up fix from https://bugs.freedesktop.org/show_bug.cgi?id=27497 to
+ fix server crash in DRI2SwapEvent handling (LP: #595182).
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 18 Jun 2010 13:32:45 +1000
xorg-server (2:1.8.1.901-1) experimental; urgency=low
diff --git a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
new file mode 100644
index 0000000..08ee08b
--- /dev/null
+++ b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
@@ -0,0 +1,33 @@
+From c1c59e7d5f0c6f0eea88657f892175166679da4f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 15 May 2010 19:24:30 +0100
+Subject: [PATCH] dri2: Only send the swap event if the client hasn't gone fishing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ Bug 27497 - xorg crashes after update to 1.8.0
+ https://bugs.freedesktop.org/show_bug.cgi?id=27497
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Kristian Høgsberg <krh@bitplanet.net>
+---
+ hw/xfree86/dri2/dri2ext.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+Index: xorg-server/hw/xfree86/dri2/dri2ext.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/dri2/dri2ext.c 2010-06-18 12:59:17.534477001 +1000
++++ xorg-server/hw/xfree86/dri2/dri2ext.c 2010-06-18 13:06:30.914477000 +1000
+@@ -355,6 +355,9 @@
+ xDRI2BufferSwapComplete event;
+ DrawablePtr pDrawable = data;
+
++ if (client->clientGone)
++ return;
++
+ event.type = DRI2EventBase + DRI2_BufferSwapComplete;
+ event.sequenceNumber = client->sequence;
+ event.event_type = type;
diff --git a/debian/patches/series b/debian/patches/series
index adf3c9c..f850a70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
16-xaa-fbcomposite-fix-negative-size.diff
+17-fix-DRI2-segfault-when-clientGone.diff
Reply to: