From 9ed67727431d1b9fb2995fc0ef9181e3d966561d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 9 Jul 2013 20:04:52 +1000 Subject: [PATCH] Fix crash on 32-bit with virtual box guest additions (#972095) --- ...itialized-var-in-__glXDRIscreenProbe.patch | 30 +++++++++++++++++++ xorg-x11-server.spec | 9 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch diff --git a/0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch b/0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch new file mode 100644 index 0000000..08c8d26 --- /dev/null +++ b/0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch @@ -0,0 +1,30 @@ +From cc3d1a5a6120e721a46c67446ba68f5596055633 Mon Sep 17 00:00:00 2001 +From: Piotr Dziwinski +Date: Sat, 23 Feb 2013 13:14:45 +0100 +Subject: [PATCH] glx: fix uninitialized var in __glXDRIscreenProbe + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59825 + +Signed-off-by: Piotr Dziwinski +Reviewed-by: Keith Packard +Signed-off-by: Keith Packard +--- + glx/glxdri.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/glx/glxdri.c b/glx/glxdri.c +index da46468..a997e2f 100644 +--- a/glx/glxdri.c ++++ b/glx/glxdri.c +@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + size_t buffer_size; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + ++ framebuffer.base = NULL; ++ + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || + !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { + LogMessage(X_INFO, +-- +1.8.2.1 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1cc5fb1..adae644 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.14.2 -Release: 2%{?gitdate:.%{gitdate}}%{dist} +Release: 3%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -142,6 +142,10 @@ Patch8034: 0035-dix-remove-logspam-in-RefCursor.patch # https://bugs.freedesktop.org/show_bug.cgi?id=66720 Patch8035: 0001-dix-when-ungrabbing-an-active-grab-accept-pointer-gr.patch +# Bug 972095 - X server fails on 32-bit Fedora 19 with VirtualBox Guest Additions installed +# https://bugzilla.redhat.com/show_bug.cgi?id=972095 +Patch8036: 0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch + # upstream in -next for 1.15, e21e183059df5975e7086850d1931edb2c1bbd06 %if !0%{?rhel} Patch7071: 0001-os-use-libunwind-to-generate-backtraces.patch @@ -619,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Tue Jul 09 2013 Peter Hutterer 1.14.2-3 +- Fix crash on 32-bit with virtual box guest additions (#972095) + * Tue Jul 09 2013 Peter Hutterer 1.14.2-2 - Fix crash in gnome-shell when tapping a menu twice (fdo #66720)