Changeset 19220 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

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

Author:

vboxsync

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

46589

Message:

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

File:

• trunk/src/VBox/Additions/x11/VBoxClient/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);