Changeset 19220 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2009 3:54:13 PM (16 years ago)

Author:

vboxsync

Message:

SharedClipboard/x11: fix a potential crash if a zero-length compound text string is read

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)
• GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (1 diff)

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

@@ -390 +390 @@
     LogFlow(("vboxClipboardGetCText: converting compound text to Utf-16LE. Original is %.*s\n",
            cbSourceLen, pValue));
+    /* Quick fix for 2.2. */
+    if (cbSourceLen == 0)
+    {
+        XtFree(reinterpret_cast<char *>(pValue));
+        vboxClipboardSendData(VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                              NULL, 0);        
+    }
     /* First convert the compound text to Utf8 */
     property.value = reinterpret_cast<unsigned char *>(pValue);

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

@@ -320 +320 @@
                    cbSrcLen, cb, cbSrcLen, reinterpret_cast<char *>(pValue)));
     *pcbActual = 0;  /* Only set this to the right value on success. */
+    /** @todo quick fix for 2.2, do this properly. */
+    if (cbSrcLen == 0)
+    {
+        XtFree(reinterpret_cast<char *>(pValue));
+        if (cb < 2)
+            return VERR_BUFFER_OVERFLOW;
+        *(PRTUTF16) pv = 0;
+        *pcbActual = 2;
+        return VINF_SUCCESS;
+    }
     /* First convert the compound text to Utf8 */
     property.value = reinterpret_cast<unsigned char *>(pValue);