Changeset 100463 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2023 2:36:27 PM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Bugfixes for shClTransferResolvePathAbs(). bugref:9437

File:

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

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

@@ -130 +130 @@
  * @param   pTransfer           Clipboard transfer to resolve path for.
  * @param   pszPath             Relative path to resolve.
+ *                              Paths have to end with a (back-)slash, otherwise this is considered to be a file.
  * @param   fFlags              Resolve flags. Currently not used and must be 0.
  * @param   ppszResolved        Where to store the allocated resolved path. Must be free'd by the called using RTStrFree().
@@ -136 +137 @@
                                       char **ppszResolved)
 {
-    AssertPtrReturn(pTransfer,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pszPath,     VERR_INVALID_POINTER);
-    AssertReturn   (fFlags == 0, VERR_INVALID_PARAMETER);
-
-    LogFlowFunc(("pszPathRootAbs=%s, pszPath=%s\n", pTransfer->pszPathRootAbs, pszPath));
+    AssertPtrReturn(pTransfer,    VERR_INVALID_POINTER);
+    AssertPtrReturn(pszPath,      VERR_INVALID_POINTER);
+    AssertReturn   (fFlags == 0,  VERR_INVALID_PARAMETER);
+    AssertPtrReturn(ppszResolved, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("pszPath=%s, fFlags=%#x (pszPathRootAbs=%s, cRootListEntries=%RU64)\n",
+                 pszPath, fFlags, pTransfer->pszPathRootAbs, pTransfer->lstRoots.Hdr.cEntries));
 
     int rc = ShClTransferValidatePath(pszPath, false /* fMustExist */);
@@ -147 +150 @@
         rc = VERR_PATH_NOT_FOUND; /* Play safe by default. */
 
-        /* Make sure the given path is part of the set of root entries. */
         PSHCLLISTENTRY pEntry;
         RTListForEach(&pTransfer->lstRoots.lstEntries, pEntry, SHCLLISTENTRY, Node)
@@ -153 +155 @@
             LogFlowFunc(("\tpEntry->pszName=%s\n", pEntry->pszName));
 
-            if (!RTStrCmp(pszPath, pEntry->pszName)) /* Case-sensitive! */
+            if (RTStrStartsWith(pszPath, pEntry->pszName)) /* Case-sensitive! */
             {
                 rc = VINF_SUCCESS;
@@ -174 +176 @@
                 if (RT_SUCCESS(rc))
                 {
-                    LogFlowFunc(("pszResolved=%s\n", szResolved));
-
-                    if (RT_SUCCESS(rc))
-                        *ppszResolved = RTStrDup(szResolved);
+                    LogRel2(("Shared Clipboard: Resolved: '%s' -> '%s'\n", pszPath, szResolved));
+
+                    *ppszResolved = RTStrDup(szResolved);
                 }
             }