Changeset 100265 in vbox

Timestamp:

Jun 23, 2023 1:50:43 PM (22 months ago)

Author:

vboxsync

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

157980

Message:

Shared Clipboard: Added handling an explicit absolute root path for shClTransferListEntryQueryFsInfo(). bugref:9437

File:

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

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-provider-local.cpp

@@ -317 +317 @@
 }
 
-static int shClTransferListEntryQueryFsInfo(PSHCLLISTENTRY pListEntry, PSHCLFSOBJINFO pFsObjInfo)
-{
+/**
+ * Queries information about a local list entry.
+ *
+ * @returns VBox status code.
+ * @param   pszPathRootAbs      Absolute root path to use for the entry.
+ * @param   pListEntry          List entry to query information for.
+ * @param   pFsObjInfo          Where to store the queried information on success.
+ */
+static int shClTransferListEntryQueryFsInfo(const char *pszPathRootAbs, PSHCLLISTENTRY pListEntry, PSHCLFSOBJINFO pFsObjInfo)
+{
+    AssertPtrReturn(pszPathRootAbs, VERR_INVALID_POINTER);
     AssertPtrReturn(pListEntry, VERR_INVALID_POINTER);
 
-    const char *pcszSrcPathAbs = pListEntry->pszName;
-    AssertPtrReturn(pcszSrcPathAbs, VERR_INVALID_POINTER);
-
-    int rc;
-
-    /* Make sure that we only advertise relative source paths, not absolute ones. */
-    char *pszFileName = RTPathFilename(pcszSrcPathAbs);
-    if (pszFileName)
-    {
-        Assert(pszFileName >= pcszSrcPathAbs);
-        size_t cchDstBase = pszFileName - pcszSrcPathAbs;
-        const char *pszDstPath = &pcszSrcPathAbs[cchDstBase];
-
-        LogFlowFunc(("pcszSrcPathAbs=%s, pszDstPath=%s\n", pcszSrcPathAbs, pszDstPath));
-
-        RTFSOBJINFO fsObjInfo;
-        rc = RTPathQueryInfo(pcszSrcPathAbs, &fsObjInfo, RTFSOBJATTRADD_NOTHING);
-        if (RT_SUCCESS(rc))
-            rc = ShClFsObjInfoFromIPRT(pFsObjInfo, &fsObjInfo);
-    }
-    else
-        rc = VERR_INVALID_POINTER;
+    const char *pszSrcPathAbs = RTPathJoinA(pszPathRootAbs, pListEntry->pszName);
+    AssertPtrReturn(pszSrcPathAbs, VERR_NO_MEMORY);
+
+    RTFSOBJINFO fsObjInfo;
+    int rc = RTPathQueryInfo(pszSrcPathAbs, &fsObjInfo, RTFSOBJATTRADD_NOTHING);
+    if (RT_SUCCESS(rc))
+        rc = ShClFsObjInfoFromIPRT(pFsObjInfo, &fsObjInfo);
 
     return rc;
@@ -358 +352 @@
     {
         AssertBreakStmt(pEntry->cbInfo == sizeof(SHCLFSOBJINFO), rc = VERR_WRONG_ORDER);
-        rc = shClTransferListEntryQueryFsInfo(pEntry, (PSHCLFSOBJINFO)pEntry->pvInfo);
+        rc = shClTransferListEntryQueryFsInfo(pCtx->pTransfer->pszPathRootAbs, pEntry, (PSHCLFSOBJINFO)pEntry->pvInfo);
         if (RT_FAILURE(rc)) /* Currently this is an all-or-nothing op. */
             break;