Changeset 84717 in vbox for trunk

Timestamp:

Jun 7, 2020 7:11:56 AM (5 years ago)

Author:

vboxsync

Message:

SharedClipboard/clipboard-x11.cpp: Fix the crashing tstClipboardGH-X11 testcase as it expects a NULL terminated array of supported formats, leave two todos for the author

File:

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

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

@@ -129 +129 @@
     /** @todo Add Wayland / Weston support. */
 #endif
-    { "LAST",                               SHCLX11FMT_INVALID,     VBOX_SHCL_FMT_NONE },
+    /** @todo r=aeichner The "LAST" in there was causing tstClipboardGH-X11.cpp:XInternAtom to crash because it was reading out side of the array. */
+    { NULL,                                 SHCLX11FMT_INVALID,     VBOX_SHCL_FMT_NONE },
 };
 
@@ -728 +729 @@
         for (i = 0; i < *pcLen; ++i)
         {
-            for (j = 0; j < RT_ELEMENTS(g_aFormats); ++j)
+            for (j = 0; j < RT_ELEMENTS(g_aFormats) - 1; ++j) /** @todo r=aeichner Don't include the last invalid format. */
             {
                 Atom target = XInternAtom(XtDisplay(widget),