Changeset 86370 in vbox for trunk

Timestamp:

Oct 1, 2020 5:13:42 AM (4 years ago)

Author:

vboxsync

Message:

DragAndDrop: Do not allocate pObj twice in dndTransferListObjAdd. bugref:9841

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDTransferList.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/DragAndDrop/DnDTransferList.cpp

@@ -250 +250 @@
         if (pObj)
         {
-            pObj = (PDNDTRANSFEROBJECT)RTMemAllocZ(sizeof(DNDTRANSFEROBJECT));
-            if (pObj)
+            const bool fIsFile = RTFS_IS_FILE(fMode);
+
+            rc = DnDTransferObjectInitEx(pObj, fIsFile ? DNDTRANSFEROBJTYPE_FILE : DNDTRANSFEROBJTYPE_DIRECTORY,
+                                         pList->pszPathRootAbs, &pcszSrcAbs[idxPathToAdd]);
+            if (RT_SUCCESS(rc))
             {
-                const bool fIsFile = RTFS_IS_FILE(fMode);
-
-                rc = DnDTransferObjectInitEx(pObj, fIsFile ? DNDTRANSFEROBJTYPE_FILE : DNDTRANSFEROBJTYPE_DIRECTORY,
-                                             pList->pszPathRootAbs, &pcszSrcAbs[idxPathToAdd]);
+                if (fIsFile)
+                    rc = DnDTransferObjectOpen(pObj,
+                                               RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, /** @todo Add a standard fOpen mode for this list. */
+                                               0 /* fMode */, DNDTRANSFEROBJECT_FLAGS_NONE);
                 if (RT_SUCCESS(rc))
                 {
+                    RTListAppend(&pList->lstObj, &pObj->Node);
+
+                    pList->cObj++;
                     if (fIsFile)
-                        rc = DnDTransferObjectOpen(pObj,
-                                                   RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, /** @todo Add a standard fOpen mode for this list. */
-                                                   0 /* fMode */, DNDTRANSFEROBJECT_FLAGS_NONE);
-                    if (RT_SUCCESS(rc))
-                    {
-                        RTListAppend(&pList->lstObj, &pObj->Node);
-
-                        pList->cObj++;
-                        if (fIsFile)
-                            pList->cbObjTotal += DnDTransferObjectGetSize(pObj);
-
-                        if (   fIsFile
-                            && !(fFlags & DNDTRANSFERLIST_FLAGS_KEEP_OPEN)) /* Shall we keep the file open while being added to this list? */
-                            DnDTransferObjectClose(pObj);
-                    }
-
-                    if (RT_FAILURE(rc))
-                        DnDTransferObjectDestroy(pObj);
+                        pList->cbObjTotal += DnDTransferObjectGetSize(pObj);
+
+                    if (   fIsFile
+                        && !(fFlags & DNDTRANSFERLIST_FLAGS_KEEP_OPEN)) /* Shall we keep the file open while being added to this list? */
+                        DnDTransferObjectClose(pObj);
                 }
+
+                if (RT_FAILURE(rc))
+                    DnDTransferObjectDestroy(pObj);
             }
-            else
-                rc = VERR_NO_MEMORY;
 
             if (RT_FAILURE(rc))