From bd5ab51b5e41af2174ca4b5c80b282a0f88584ad Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mar 03 2020 15:46:06 +0000
Subject: Fix VBoxClient --vmsvga-x11 crash (rhbz#1806778)


---

diff --git a/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
new file mode 100644
index 0000000..27ba6b2
--- /dev/null
+++ b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
@@ -0,0 +1,23 @@
+diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
+--- VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~	2020-02-18 18:13:08.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp	2020-03-03 16:27:49.947341705 +0100
+@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase))
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor))
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
+ }
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 860069d..1831a48 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -2,7 +2,7 @@
 
 Name:       virtualbox-guest-additions
 Version:    6.1.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -16,6 +16,8 @@ Source3:    VirtualBox-60-vboxguest.rules
 Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
 # Do not show an error dialog when not running under vbox
 Patch3:     VirtualBox-5.2.10-xclient.patch
+# Fix for https://www.virtualbox.org/ticket/19357 / rhbz#1806778
+Patch4:     VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  kBuild >= 0.1.9998.r3093
@@ -164,6 +166,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Tue Mar  3 2020 Hans de Goede <hdegoede@redhat.com> - 6.1.4-2
+- Fix VBoxClient --vmsvga-x11 crash (rhbz#1806778)
+
 * Sat Feb 22 2020 Sérgio Basto <sergio@serjux.com> - 6.1.4-1
 - Update Virtualbox Guest Additions to 6.1.4