Changeset 85567 in vbox

Timestamp:

Jul 30, 2020 5:21:27 PM (5 years ago)

Author:

vboxsync

Message:

GA/Linux: bugref:9804: Trunk GAs have a VBoxClient shared clipboard assertion crash problem on Linux 3.10 kernels

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-x11.cpp (modified) (7 diffs)
• testcase/tstClipboardGH-X11.cpp (modified) (4 diffs)

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

@@ -129 +129 @@
     /** @todo Add Wayland / Weston support. */
 #endif
-    /** @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 },
 };
 
@@ -185 +183 @@
 
 
+#ifdef TESTCASE
+/**
+ * Return the max. number of elements in the X11 format table.
+ * Used by the testing code in tstClipboardGH-X11.cpp
+ * which cannot use RT_ELEMENTS(g_aFormats) directly.
+ *
+ * @return size_t The number of elements in the g_aFormats array.
+ */
+SHCL_X11_DECL(size_t) clipReportMaxX11Formats(void)
+{
+    return (RT_ELEMENTS(g_aFormats));
+}
+#endif
+
 /**
  * Returns the atom corresponding to a supported X11 format.
@@ -195 +207 @@
 {
     LogFlowFunc(("format=%u -> pcszAtom=%s\n", uFmtIdx, g_aFormats[uFmtIdx].pcszAtom));
-    AssertReturn(uFmtIdx <= RT_ELEMENTS(g_aFormats), 0);
+    AssertReturn(uFmtIdx < RT_ELEMENTS(g_aFormats), 0);
     return clipGetAtom(pCtx, g_aFormats[uFmtIdx].pcszAtom);
 }
@@ -207 +219 @@
 SHCL_X11_DECL(SHCLX11FMT) clipRealFormatForX11Format(SHCLX11FMTIDX uFmtIdx)
 {
-    AssertReturn(uFmtIdx <= RT_ELEMENTS(g_aFormats), SHCLX11FMT_INVALID);
+    AssertReturn(uFmtIdx < RT_ELEMENTS(g_aFormats), SHCLX11FMT_INVALID);
     return g_aFormats[uFmtIdx].enmFmtX11;
 }
@@ -219 +231 @@
 static SHCLFORMAT clipVBoxFormatForX11Format(SHCLX11FMTIDX uFmtIdx)
 {
-    AssertReturn(uFmtIdx <= RT_ELEMENTS(g_aFormats), VBOX_SHCL_FMT_NONE);
+    AssertReturn(uFmtIdx < RT_ELEMENTS(g_aFormats), VBOX_SHCL_FMT_NONE);
     return g_aFormats[uFmtIdx].uFmtVBox;
 }
@@ -729 +741 @@
         for (i = 0; i < *pcLen; ++i)
         {
-            for (j = 0; j < RT_ELEMENTS(g_aFormats) - 1; ++j) /** @todo r=aeichner Don't include the last invalid format. */
+            for (j = 0; j < RT_ELEMENTS(g_aFormats); ++j)
             {
                 Atom target = XInternAtom(XtDisplay(widget),
@@ -2346 +2358 @@
     return rc;
 }
-

trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp

@@ -41 +41 @@
 extern SHCLX11FMT clipRealFormatForX11Format(SHCLX11FMTIDX uFmtIdx);
 extern Atom clipGetAtom(PSHCLX11CTX pCtx, const char *pcszName);
+extern size_t clipReportMaxX11Formats(void);
 
 
@@ -187 +188 @@
     Atom atom = 0;
     unsigned i = 0;
-    while (g_aFormats[i].pcszAtom)
+    const size_t j = clipReportMaxX11Formats();
+
+    for (i = 0; i < j; ++i)
     {
         if (!strcmp(pcsz, g_aFormats[i].pcszAtom))
             atom = (Atom) (i + 0x1000);
-        ++i;
     }
     for (i = 0; i < RT_ELEMENTS(g_tst_apszSupAtoms); ++i)
@@ -366 +368 @@
     {
         unsigned index = atom - 0x1000;
+        AssertReturn(index < clipReportMaxX11Formats(), NULL);
         pcszName = g_aFormats[index].pcszAtom;
     }
@@ -420 +423 @@
 static SHCLX11FMTIDX tstClipFindX11FormatByAtomText(const char *pcszAtom)
 {
-    unsigned i = 0;
-    while (g_aFormats[i].pcszAtom)
+    const size_t j = clipReportMaxX11Formats();
+
+    for (unsigned i = 0; i < j; ++i)
     {
         if (!strcmp(g_aFormats[i].pcszAtom, pcszAtom))
             return i;
-        ++i;
     }
     return NIL_CLIPX11FORMAT;