debian/changelog | 8 +++
debian/patches/17-fix-DRI2-segfault-when-clientGone.diff | 33 +++++++++++++++
debian/patches/series | 1
3 files changed, 42 insertions(+)
New commits:
commit 5b024e870d06f024c400bdb015e32b405e6a5b4e
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 18 14:38:09 2010 +1000
Cherry pick from Debian-experimental:
Add fix for server crash in DRI2 (FDO bug: #27497)
diff --git a/debian/changelog b/debian/changelog
index 723e002..6f03958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.8.1.901-1ubuntu2) maverick; urgency=low
+
+ * 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 <r...@ubuntu.com> Fri, 18 Jun 2010
13:32:45 +1000
+
xorg-server (2:1.8.1.901-1ubuntu1) maverick; urgency=low
[ Timo Aaltonen ]
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 <ch...@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 <ch...@chris-wilson.co.uk>
+Cc: Kristian Høgsberg <k...@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 39384f4..8e9c52e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@
#13_debian_add_xkbpath_env_variable.diff
15-nouveau.diff
16-xaa-fbcomposite-fix-negative-size.diff
+17-fix-DRI2-segfault-when-clientGone.diff
100_rethrow_signals.patch
#104_nvidia_autodetect.patch
#105_fglrx_autodetect.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/e1opuo7-0005oh...@alioth.debian.org
