[xorg-x11-server] Fix xvfb crash on client disconnect (rhbz#1113128)

[Hans de Goede]

commit 9d74bb16d60fe88e99cf2a72f44481cde8cda0a3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jul 2 17:33:47 2014 +0200

    Fix xvfb crash on client disconnect (rhbz#1113128)

 ...-crash-in-fbCloseScreen-on-client-disconn.patch |   35 ++++++++++++++++++++
 xorg-x11-server.spec                               |    8 ++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0001-fb-Fix-xvfb-crash-in-fbCloseScreen-on-client-disconn.patch b/0001-fb-Fix-xvfb-crash-in-fbCloseScreen-on-client-disconn.patch
new file mode 100644
index 0000000..82fc1c9
--- /dev/null
+++ b/0001-fb-Fix-xvfb-crash-in-fbCloseScreen-on-client-disconn.patch
@@ -0,0 +1,35 @@
+From 7103563676f5970e14da38923a15641fc1877328 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Wed, 2 Jul 2014 17:19:30 +0200
+Subject: [PATCH] fb: Fix xvfb crash in fbCloseScreen on client disconnect
+
+Fix xvfb crash on client disconnect:
+https://bugzilla.redhat.com/show_bug.cgi?id=1113128
+caused by:
+http://patchwork.freedesktop.org/patch/24757/
+
+The discussion there has some ideas for a better / cleaner fix, but for now
+lets gets this fixed before the 1.16 release with this simple fix.
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ fb/fbscreen.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fb/fbscreen.c b/fb/fbscreen.c
+index 1f91089..0d4d87f 100644
+--- a/fb/fbscreen.c
++++ b/fb/fbscreen.c
+@@ -37,7 +37,8 @@ fbCloseScreen(ScreenPtr pScreen)
+         free(depths[d].vids);
+     free(depths);
+     free(pScreen->visuals);
+-    FreePixmap((PixmapPtr)pScreen->devPrivate);
++    if (pScreen->devPrivate)
++        FreePixmap((PixmapPtr)pScreen->devPrivate);
+     return TRUE;
+ }
+ 
+-- 
+2.0.0
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index cfed120..cf2530b 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.15.99.903
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -74,6 +74,9 @@ Source31: xserver-sdk-abi-requires.git
 # maintainer convenience script
 Source40: driver-abi-rebuild.sh
 
+# Submitted upstream
+Patch0001: 0001-fb-Fix-xvfb-crash-in-fbCloseScreen-on-client-disconn.patch
+
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002: xserver-1.4.99-ssh-isnt-local.patch
@@ -615,6 +618,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Wed Jul  2 2014 Hans de Goede <hdegoede at redhat.com> - 1.15.99.903-3
+- Fix xvfb crash on client disconnect (rhbz#1113128)
+
 * Thu Jun 19 2014 Dennis Gilmore <dennis at ausil.us> - 1.15.99.903-2
 - add support for non pci platform devices