Changeset 32832 in vbox

Timestamp:

Sep 29, 2010 9:11:30 PM (15 years ago)

Author:

vboxsync

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

66291

Message:

Additions/x11/VBoxClient: attempt to fix segfault on shutdown

File:

• trunk/src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -27 +27 @@
 #include <X11/Xlib.h>
 
+#include <iprt/critsect.h>
 #include <iprt/env.h>
 #include <iprt/initterm.h>
@@ -51 +52 @@
  * cleanup routine. */
 static RTFILE g_hPidFile;
+/** Global critical section used to protect the clean-up routine, which can be
+ * called from different threads.
+ */
+RTCRITSECT g_critSect;
 
 /** Clean up if we get a signal or something.  This is extern so that we
@@ -56 +61 @@
 void VBoxClient::CleanUp()
 {
+    /* We never release this, as we end up with a call to exit(3) which is not
+     * async-safe.  Until we fix this application properly, we should be sure
+     * never to exit from anywhere except from this method. */
+    int rc = RTCritSectEnter(&g_critSect);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("VBoxClient: Failure while acquiring the global critical section, rc=%Rrc\n", rc);
+        _Exit(1);
+    }
     if (g_pService)
     {
@@ -149 +163 @@
 int main(int argc, char *argv[])
 {
-    int rcClipboard, rc = VINF_SUCCESS;
+    int rcClipboard, rc;
     const char *pszFileName = RTPathFilename(argv[0]);
     bool fDaemonise = true;
@@ -161 +175 @@
 
     /* Initialise our runtime before all else. */
-    RTR3Init();
+    rc = RTR3Init();
+    if (RT_FAILURE(rc))
+    {
+        /* Of course, this should never happen. */
+        RTPrintf("%s: Failed to initialise the run-time library, rc=%Rrc\n", pszFileName, rc);
+        exit(1);
+    }
+
+    /* Initialise our global clean-up critical section */
+    rc = RTCritSectInit(&g_critSect);
+    if (RT_FAILURE(rc))
+    {
+        /* Of course, this should never happen. */
+        RTPrintf("%s: Failed to initialise the global critical section, rc=%Rrc\n", pszFileName, rc);
+        exit(1);
+    }
 
     /* Parse our option(s) */