Changeset 90218 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jul 15, 2021 7:45:34 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145755

Message:

Add/Lnx/VBoxClient/vmsvga: Try avoid closing the same display structure more than once by setting the members to NULL afte closing. Don't call XRRSelectInput with a NULL display pointer. (Background: Saw Ubuntu complaing once about a double free with XCloseDisplay and the signal handler on the stack.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -779 +779 @@
     }
 
-#ifdef WITH_DISTRO_XRAND_XINERAMA
-    XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
-#else
-    if (x11Context.pXRRSelectInput)
-        x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
-#endif
-
-    XCloseDisplay(x11Context.pDisplay);
-    XCloseDisplay(x11Context.pDisplayRandRMonitoring);
+    if (x11Context.pDisplayRandRMonitoring)
+    {
+#ifdef WITH_DISTRO_XRAND_XINERAMA
+        XRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
+#else
+        if (x11Context.pXRRSelectInput)
+            x11Context.pXRRSelectInput(x11Context.pDisplayRandRMonitoring, x11Context.rootWindow, 0);
+#endif
+    }
+
+    if (x11Context.pDisplay)
+    {
+        XCloseDisplay(x11Context.pDisplay);
+        x11Context.pDisplay = NULL;
+    }
+
+    if (x11Context.pDisplayRandRMonitoring)
+    {
+        XCloseDisplay(x11Context.pDisplayRandRMonitoring);
+        x11Context.pDisplayRandRMonitoring = NULL;
+    }
 
     if (x11Context.pRandLibraryHandle)