Changeset 6893 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Feb 11, 2008 11:13:53 AM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: exception-safety in VBoxClient

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

• seamless-host.h (modified) (1 diff)
• seamless-x11.h (modified) (3 diffs)
• thread.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/xclient/seamless-host.h

@@ -161 +161 @@
         {
             LogRel(("VBoxService: seamless host object still running!  Stopping...\n"));
-            stop();
+            try
+            {
+                stop();
+            }
+            catch(...) {}
         }
     }

trunk/src/VBox/Additions/x11/xclient/seamless-x11.h

@@ -135 +135 @@
     Display *mDisplay;
 public:
-    VBoxGuestX11Display(void) {}
-    bool init(char *name = 0)
+    VBoxGuestX11Display(void) { mDisplay = NULL; }
+    bool init(char *name = NULL)
     {
         mDisplay = XOpenDisplay(name);
-        return (0 != mDisplay);
+        return (mDisplay != NULL);
     }
     operator Display *() { return mDisplay; }
     Display *get(void) { return mDisplay; }
-    bool isValid(void) { return (0 != mDisplay); }
-    int close(void) { return XCloseDisplay(mDisplay); }
-    ~VBoxGuestX11Display() { close(); }
+    bool isValid(void) { return (mDisplay != NULL); }
+    int close(void)
+    {
+        int rc = XCloseDisplay(mDisplay);
+        mDisplay = NULL;
+        return rc;
+    }
+    ~VBoxGuestX11Display()
+    {
+        if (mDisplay != NULL)
+            close();
+    }
 };
 
@@ -204 +213 @@
     {
         /* We use post-increment in the operation to prevent the iterator from being invalidated. */
-        for (iterator it = begin(); it != end(); removeWindow(it++));
+        try
+        {
+            for (iterator it = begin(); it != end(); removeWindow(it++));
+        }
+        catch(...) {}
     }
 
@@ -327 +340 @@
     }
 
-    ~VBoxGuestSeamlessX11() { uninit(); }
+    ~VBoxGuestSeamlessX11()
+    {
+        try
+        {
+            uninit();
+        }
+        catch(...) {}
+    }
 };
 

trunk/src/VBox/Additions/x11/xclient/thread.cpp

@@ -59 +59 @@
     {
         LogRelThisFunc(("Warning!  Stopping thread %s, as it is still running!\n", mName));
-        stop(1000, 0);
+        try
+        {
+            stop(1000, 0);
+        }
+        catch(...) {}
     }
 }