Changeset 13249 in vbox for trunk/src

Timestamp:

Oct 14, 2008 11:30:03 AM (16 years ago)

Author:

vboxsync

Message:

Linux guest clipboard text conversion fix: resulting text length was not calculated (public bugtracket 2015).

File:

• trunk/src/VBox/Additions/x11/xclient/clipboard.cpp (modified) (5 diffs)

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

@@ -933 +933 @@
     PRTUTF16 pu16GuestText, pu16HostText;
     char *pcGuestText;
-    unsigned cbHostText, cwHostText, cwGuestText, cbGuestText;
+    unsigned cbHostText, cwHostText, cwGuestText, cbGuestTextBuffer;
+    size_t cbGuestTextActual;
     int rc;
 
@@ -942 +943 @@
     if ((rc != VINF_SUCCESS) || cbHostText == 0)
     {
-        LogFlow(("vboxClipboardConvertUtf16: vboxClipboardReadHostData returned %Vrc, %d bytes of data\n", rc, cbGuestText));
+        LogFlow(("vboxClipboardConvertUtf16: vboxClipboardReadHostData returned %Vrc, %d bytes of data\n", rc, cbHostText));
         g_ctx.hostFormats = 0;
         LogFlowFunc(("rc = false\n"));
@@ -967 +968 @@
     }
     /* Now convert the Utf16 Linux text to Utf8 */
-    cbGuestText = cwGuestText * 3;  /* Should always be enough. */
-    pcGuestText = XtMalloc(cbGuestText);
+    cbGuestTextBuffer = cwGuestText * 3;  /* Should always be enough. */
+    pcGuestText = XtMalloc(cbGuestTextBuffer);
     if (pcGuestText == 0)
     {
@@ -976 +977 @@
     }
     /* Our runtime can't cope with endian markers. */
-    rc = RTUtf16ToUtf8Ex(pu16GuestText + 1, cwGuestText - 1, &pcGuestText, cbGuestText, 0);
+    cbGuestTextActual = 0;
+    rc = RTUtf16ToUtf8Ex(pu16GuestText + 1, cwGuestText - 1, &pcGuestText, cbGuestTextBuffer, &cbGuestTextActual);
     RTMemFree(reinterpret_cast<char *>(pu16GuestText));
     if (rc != VINF_SUCCESS)
@@ -984 +986 @@
         return false;
     }
-    LogFlow(("vboxClipboardConvertUtf8: converted text is %.*s\n", cbGuestText, pcGuestText));
+    LogFlow(("vboxClipboardConvertUtf8: converted text is %.*s\n", cbGuestTextActual, pcGuestText));
     *atomTypeReturn = g_ctx.atomUtf8;
     *pValReturn = reinterpret_cast<XtPointer>(pcGuestText);
-    *pcLenReturn = cbGuestText;
+    *pcLenReturn = (unsigned long)cbGuestTextActual;
     *piFormatReturn = 8;
     LogFlowFunc(("rc = true\n"));