Changeset 81342 in vbox

Timestamp:

Oct 18, 2019 8:11:58 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Some fixes for shClTransferResolvePathAbs(). Untested.

File:

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

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

@@ -1385 +1385 @@
 
     /* Paranoia. */
-    if (   !strlen(pTransfer->pszPathRootAbs)
-        || !RTStrIsValidEncoding(pTransfer->pszPathRootAbs)
-        || !RTStrCmp(pTransfer->pszPathRootAbs, ".")
-        || !RTStrCmp(pTransfer->pszPathRootAbs, "..")
-        || !RTPathStartsWithRoot(pTransfer->pszPathRootAbs))
-    {
+    if (   !strlen(pszPath)
+        || !RTStrIsValidEncoding(pszPath)
+        ||  RTStrStr(pszPath, ".")
+        ||  RTStrStr(pszPath, ".."))
+    {
+        LogRel(("Shared Clipboard: Resolving absolute path '%s' failed, invalid\n", pszPath));
         return VERR_INVALID_PARAMETER;
     }
@@ -2317 +2317 @@
         pTransfer->pszPathRootAbs = pszPathRootAbs;
         LogFlowFunc(("pszPathRootAbs=%s, cRoots=%zu\n", pTransfer->pszPathRootAbs, pTransfer->cRoots));
-    }
+
+        LogRel2(("Shared Clipboard: Transfer uses root '%s'\n", pTransfer->pszPathRootAbs));
+    }
+    else
+        LogRel(("Shared Clipboard: Unable to set roots for transfer, rc=%Rrc\n", rc));
 
     LogFlowFuncLeaveRC(rc);