Changeset 19541 in vbox

Timestamp:

May 8, 2009 8:10:15 PM (16 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard/x11: fixes to the testcase

File:

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

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

@@ -1615 +1615 @@
         AssertReturn(!(text_prop->value[i] & 0x80), XConverterNotFound);
     char **ppList = (char **)RTMemAlloc(sizeof(char *));
-    char *pValue = (char *)RTMemDup(text_prop->value, text_prop->nitems + 1);
+    char *pValue = (char *)RTMemAlloc(text_prop->nitems + 1);
+    if (pValue)
+    {
+        memcpy(pValue, text_prop->value, text_prop->nitems);
+        pValue[text_prop->nitems] = 0;
+    }
     if (ppList)
         *ppList = pValue;
@@ -1731 +1736 @@
         /* Otherwise this is probably a caller error. */
         Assert(target != g_selTarget);
-        callback(NULL, closure, &selection, &type, NULL, &count, &format);
+        callback(widget, closure, &selection, &type, NULL, &count, &format);
                 /* Could not convert to target. */
         return;
@@ -1756 +1761 @@
         format = 0;
     }
-    callback(NULL, closure, &selection, &type, pValue,
+    callback(widget, closure, &selection, &type, pValue,
              &count, &format);
 }