Changeset 7887 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Apr 10, 2008 5:17:43 PM (17 years ago)

Author:

vboxsync

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

29513

Message:

HostServices/SharedClipboard: fixed a possible segmentation fault in the Linux clipboard code

File:

• trunk/src/VBox/HostServices/SharedClipboard/linux.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/linux.cpp

@@ -946 +946 @@
     LogFlowFunc (("called\n"));
     rc = vboxClipboardReadDataFromClient(&g_ctx, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT);
-    if ((rc != VINF_SUCCESS) || (g_ctx.pClient->data.cb == 0))
-    {
-        LogRel (("vboxClipboardConvertUtf16: vboxClipboardReadDataFromClient returned %Vrc, %d bytes of data\n", rc, g_ctx.pClient->data.cb));
+    if ((RT_FAILURE(rc)) || (g_ctx.pClient->data.cb == 0))
+    {
+        /* If vboxClipboardReadDataFromClient fails then pClient may be invalid */
+        LogRelFunc (("vboxClipboardReadDataFromClient returned %Rrc%s\n", rc,
+                     RT_SUCCESS(rc) ? ", g_ctx.pClient->data.cb == 0" :  ""));
         vboxClipboardEmptyGuestBuffer();
         return false;
@@ -1017 +1019 @@
     if ((rc != VINF_SUCCESS) || (g_ctx.pClient->data.cb == 0))
     {
-        LogRel (("vboxClipboardConvertUtf8: vboxClipboardReadDataFromClient returned %Vrc, %d bytes of data\n", rc, g_ctx.pClient->data.cb));
+        /* If vboxClipboardReadDataFromClient fails then pClient may be invalid */
+        LogRelFunc (("vboxClipboardReadDataFromClient returned %Rrc%s\n", rc,
+                     RT_SUCCESS(rc) ? ", g_ctx.pClient->data.cb == 0" :  ""));
         vboxClipboardEmptyGuestBuffer();
         return false;
@@ -1108 +1112 @@
     if ((rc != VINF_SUCCESS) || (g_ctx.pClient->data.cb == 0))
     {
-        LogRel (("vboxClipboardConvertCText: vboxClipboardReadDataFromClient returned %Vrc, %d bytes of data\n", rc, g_ctx.pClient->data.cb));
+        /* If vboxClipboardReadDataFromClient fails then pClient may be invalid */
+        LogRelFunc (("vboxClipboardReadDataFromClient returned %Rrc%s\n", rc,
+                     RT_SUCCESS(rc) ? ", g_ctx.pClient->data.cb == 0" :  ""));
         vboxClipboardEmptyGuestBuffer();
         return false;