Changeset 87084 in vbox for trunk

Timestamp:

Dec 10, 2020 4:37:53 PM (4 years ago)

Author:

vboxsync

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

141867

Message:

Shared Clipboard: Check if XtMalloc actually worked in clipCreateX11Targets().

File:

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

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

@@ -1355 +1355 @@
                                 int *piFormatReturn)
 {
-    const unsigned cFixedTargets = 3;
-
-    Atom *atomTargets = (Atom *)XtMalloc((SHCL_MAX_X11_FORMATS + cFixedTargets) * sizeof(Atom));
+    const unsigned cFixedTargets = 3; /* See below. */
+
+    Atom *pAtomTargets = (Atom *)XtMalloc((SHCL_MAX_X11_FORMATS + cFixedTargets) * sizeof(Atom));
+    if (!pAtomTargets)
+        return VERR_NO_MEMORY;
+
     unsigned cTargets = 0;
     SHCLX11FMTIDX idxFmt = NIL_CLIPX11FORMAT;
@@ -1365 +1368 @@
         if (idxFmt != NIL_CLIPX11FORMAT)
         {
-            atomTargets[cTargets] = clipAtomForX11Format(pCtx, idxFmt);
+            pAtomTargets[cTargets] = clipAtomForX11Format(pCtx, idxFmt);
             ++cTargets;
         }
@@ -1371 +1374 @@
 
     /* We always offer these fixed targets. */
-    atomTargets[cTargets]     = clipGetAtom(pCtx, "TARGETS");
-    atomTargets[cTargets + 1] = clipGetAtom(pCtx, "MULTIPLE");
-    atomTargets[cTargets + 2] = clipGetAtom(pCtx, "TIMESTAMP");
+    pAtomTargets[cTargets]     = clipGetAtom(pCtx, "TARGETS");
+    pAtomTargets[cTargets + 1] = clipGetAtom(pCtx, "MULTIPLE");
+    pAtomTargets[cTargets + 2] = clipGetAtom(pCtx, "TIMESTAMP");
 
     *atomTypeReturn = XA_ATOM;
-    *pValReturn = (XtPointer)atomTargets;
+    *pValReturn = (XtPointer)pAtomTargets;
     *pcLenReturn = cTargets + cFixedTargets;
     *piFormatReturn = 32;