Changeset 22191 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Aug 11, 2009 9:18:42 PM (16 years ago)

Author:

vboxsync

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

50977

Message:

GuestHost/SharedClipboard: the X11 clipboard code should not add nul terminators which weren't there before

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (8 diffs)

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

@@ -1048 +1048 @@
                                      XtPointer *pValReturn,
                                      unsigned long *pcLenReturn,
-                                         int *piFormatReturn)
+                                     int *piFormatReturn)
 {
     char *pszTmp = NULL, *pszTmp2 = NULL;
@@ -1133 +1133 @@
                                            atomTypeReturn, pValReturn,
                                            pcLenReturn, piFormatReturn);
+        /* Our conversion functions add nul terminators if they are missing.
+         * Remove them again. */
+        if (RT_SUCCESS(rc) && ((PRTUTF16)pv)[cb / 2 - 1] != 0)
+            --(*pcLenReturn);
         RTMemFree(pv);
     }
@@ -1559 +1563 @@
                 rc = VERR_INVALID_PARAMETER;
         }
+        /* Our conversion functions add nul terminators if they are missing.
+         * Remove them again. */
+        if (RT_SUCCESS(rc) && ((const char *)pvSrc)[cbSrc - 1] != '\0')
+            cbDest -= 2;
     }
     else
@@ -2337 +2345 @@
     clipSetSelectionValues("TEXT", XA_STRING,
                            "hello world", sizeof("hello world") - 1, 8);
-    // testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
-    //                   sizeof("hello world") * 2 - 2);
+    testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
+                      sizeof("hello world") * 2 - 2);
 
     /*** COMPOUND TEXT from X11 ***/
@@ -2365 +2373 @@
     clipSetSelectionValues("COMPOUND_TEXT", XA_STRING,
                            "hello world", sizeof("hello world") - 1, 8);
-    // testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
-    //                   sizeof("hello world") * 2 - 2);
+    testStringFromX11(hTest, pCtx, "hello world", VINF_SUCCESS,
+                      sizeof("hello world") * 2 - 2);
 
     /*** Latin1 from X11 ***/
@@ -2390 +2398 @@
                            "Georges Dupr\xEA!",
                            sizeof("Georges Dupr\xEA!") - 1, 8);
-    // testLatin1FromX11(hTest, pCtx, "Georges Dupr\xEA!", VINF_SUCCESS,
-    //                   sizeof("Georges Dupr\xEA!") * 2 - 2);
+    testLatin1FromX11(hTest, pCtx, "Georges Dupr\xEA!", VINF_SUCCESS,
+                      sizeof("Georges Dupr\xEA!") * 2 - 2);
 
     /*** Unknown X11 format ***/
@@ -2497 +2505 @@
     clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "hello world",
                      sizeof("hello world") * 2 - 2);
-    // testStringFromVBox(hTest, pCtx, "TEXT",
-    //                         clipGetAtom(NULL, "TEXT"),
-    //                         "hello world", sizeof("hello world") - 1);
+    testStringFromVBox(hTest, pCtx, "TEXT", clipGetAtom(NULL, "TEXT"),
+                       "hello world", sizeof("hello world") - 1);
 
     /*** COMPOUND TEXT from VBox ***/
@@ -2535 +2542 @@
     clipSetVBoxUtf16(pCtx, VINF_SUCCESS, "hello world",
                      sizeof("hello world") * 2 - 2);
-    // testStringFromVBox(hTest, pCtx, "COMPOUND_TEXT",
-    //                         clipGetAtom(NULL, "COMPOUND_TEXT"),
-    //                         "hello world", sizeof("hello world") - 1);
+    testStringFromVBox(hTest, pCtx, "COMPOUND_TEXT",
+                       clipGetAtom(NULL, "COMPOUND_TEXT"),
+                       "hello world", sizeof("hello world") - 1);
 
     /*** Timeout from VBox ***/