Bug#636150: opu: package xorg-server/2:1.4.2-10.lenny4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: opu
This has been sitting in git for a while now (I'd actually forgotten
about this), but we may want to fix it anyway.
diff --git a/debian/changelog b/debian/changelog
index 24acf5f..d064054 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.2-10.lenny4) UNRELEASED; urgency=low
+
+ * glx: don't crash in SwapBuffers if we don't have a context
+ (closes: #603015).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 10 Nov 2010 16:57:18 +0100
+
xorg-server (2:1.4.2-10.lenny3) stable; urgency=low
* Cherry-pick patch from upstream to set umask to a sane value in Xorg
diff --git a/debian/patches/12_glx-don-t-crash-in-SwapBuffers-without-a-context.diff b/debian/patches/12_glx-don-t-crash-in-SwapBuffers-without-a-context.diff
new file mode 100644
index 0000000..e89ba93
--- /dev/null
+++ b/debian/patches/12_glx-don-t-crash-in-SwapBuffers-without-a-context.diff
@@ -0,0 +1,33 @@
+From 48d47d3bdc951c11f442c7607b6e27bcd3627751 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Wed, 10 Nov 2010 16:54:31 +0100
+Subject: [PATCH] glx: don't crash in SwapBuffers without a context
+
+Fixed upstream in d7ded953c4d263e3dd3374dc03eea19e80c05bc6 (Implment
+GLXPixmaps.)
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Tested-by: François Guerraz <kubrick@fgv6.net>
+---
+ GL/glx/glxcmds.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
+index 900a347..7330ff6 100644
+--- a/GL/glx/glxcmds.c
++++ b/GL/glx/glxcmds.c
+@@ -472,8 +472,9 @@ static int GetDrawableOrPixmap( __GLXcontext *glxc, GLXDrawable drawId,
+ if (pDraw->type == DRAWABLE_WINDOW) {
+ VisualID vid = wVisual((WindowPtr)pDraw);
+
+- modes = _gl_context_modes_find_visual(glxc->pGlxScreen->modes,
+- vid);
++ if (glxc)
++ modes = _gl_context_modes_find_visual(glxc->pGlxScreen->modes,
++ vid);
+ } else {
+ /*
+ ** An X Pixmap is not allowed as a parameter (a GLX Pixmap
+--
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a6b826e..bf6cb32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@
08_better_dpms_logging.diff
10_dont_look_in_home_for_config.diff
11_dont_crash_on_bad_dri_mode.diff
+12_glx-don-t-crash-in-SwapBuffers-without-a-context.diff
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch
Cheers,
Julien
Reply to: