Changeset 24142 in vbox

Timestamp:

Oct 28, 2009 3:10:34 PM (15 years ago)

Author:

vboxsync

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

54068

Message:

GuestHost and HostServices/SharedClipboard/x11: fix a crash when clipboard initialisation fails

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (4 diffs)
• HostServices/SharedClipboard/x11-clipboard.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -640 +640 @@
 #ifndef TESTCASE
     if (RT_SUCCESS(rc))
+    {
         rc = clipLoadXFixes(pDisplay, pCtx);
+        if (RT_FAILURE(rc))
+           LogRel(("Shared clipboard: failed to load the XFIXES extension.\n"));
+    }
 #endif
     if (RT_SUCCESS(rc))
@@ -682 +686 @@
             && (fcntl(pCtx->wakeupPipeRead, F_SETFL, O_NONBLOCK) != 0))
             rc = RTErrConvertFromErrno(errno);
+        if (RT_FAILURE(rc))
+            LogRel(("Shared clipboard: failed to setup the termination mechanism.\n"));
     }
     else
@@ -687 +693 @@
     if (RT_FAILURE(rc))
         clipUninit(pCtx);
+    if (RT_FAILURE(rc))
+        LogRel(("Shared clipboard: initialisation failed: %Rrc\n", rc));
     return rc;
 }
@@ -765 +773 @@
                             RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
         if (RT_FAILURE(rc))
-            LogRel(("Failed to initialise the shared clipboard X11 backend.\n"));
+        {
+            LogRel(("Failed to start the shared clipboard thread.\n"));
+            clipUninit(pCtx);
+        }
     }
 #endif

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -125 +125 @@
             rc = ClipStartX11(pBackend, true /* grab shared clipboard */);
         }
-        if (RT_FAILURE(rc) && pBackend)
-            ClipStopX11(pCtx->pBackend);
         if (RT_FAILURE(rc))
             RTCritSectDelete(&pCtx->clipboardMutex);