Fix crash on 32-bit with virtual box guest additions (#972095)
This commit is contained in:
parent
198a41aea7
commit
9ed6772743
30
0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch
Normal file
30
0001-glx-fix-uninitialized-var-in-__glXDRIscreenProbe.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From cc3d1a5a6120e721a46c67446ba68f5596055633 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Piotr Dziwinski <piotrdz@gmail.com>
|
||||||
|
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 <piotrdz@gmail.com>
|
||||||
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
@ -42,7 +42,7 @@
|
|||||||
Summary: X.Org X11 X server
|
Summary: X.Org X11 X server
|
||||||
Name: xorg-x11-server
|
Name: xorg-x11-server
|
||||||
Version: 1.14.2
|
Version: 1.14.2
|
||||||
Release: 2%{?gitdate:.%{gitdate}}%{dist}
|
Release: 3%{?gitdate:.%{gitdate}}%{dist}
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
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
|
# https://bugs.freedesktop.org/show_bug.cgi?id=66720
|
||||||
Patch8035: 0001-dix-when-ungrabbing-an-active-grab-accept-pointer-gr.patch
|
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
|
# upstream in -next for 1.15, e21e183059df5975e7086850d1931edb2c1bbd06
|
||||||
%if !0%{?rhel}
|
%if !0%{?rhel}
|
||||||
Patch7071: 0001-os-use-libunwind-to-generate-backtraces.patch
|
Patch7071: 0001-os-use-libunwind-to-generate-backtraces.patch
|
||||||
@ -619,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{xserver_source_dir}
|
%{xserver_source_dir}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-3
|
||||||
|
- Fix crash on 32-bit with virtual box guest additions (#972095)
|
||||||
|
|
||||||
* Tue Jul 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-2
|
* Tue Jul 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-2
|
||||||
- Fix crash in gnome-shell when tapping a menu twice (fdo #66720)
|
- Fix crash in gnome-shell when tapping a menu twice (fdo #66720)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user