Changeset 85005 in vbox for trunk/src/VBox/GuestHost/DragAndDrop

Timestamp:

Jun 30, 2020 10:46:26 AM (5 years ago)

Author:

vboxsync

Message:

DnD/URIObject: Validate paths when rebasing them + additional logging.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp (modified) (2 diffs)

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

@@ -414 +414 @@
             if (pszPathNew)
             {
-                char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
-                                               pszPathNew /* pszPath */,
-                                               NULL /* pszQuery */, NULL /* pszFragment */);
-                if (pszPathURI)
+                rc = DnDPathValidate(pszPathNew, false /* fMustExist */);
+                if (RT_SUCCESS(rc))
                 {
-                    LogFlowFunc(("Rebasing \"%s\" to \"%s\"\n", strPathAbs.c_str(), pszPathURI));
-
-                    strPathAbs = RTCString(pszPathURI) + "\r\n";
-                    RTStrFree(pszPathURI);
+                    char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
+                                                   pszPathNew /* pszPath */,
+                                                   NULL /* pszQuery */, NULL /* pszFragment */);
+                    if (pszPathURI)
+                    {
+                        LogFlowFunc(("Rebasing \"%s\" to \"%s\"\n", strPathAbs.c_str(), pszPathURI));
+
+                        strPathAbs = RTCString(pszPathURI) + "\r\n";
+                        RTStrFree(pszPathURI);
+                    }
+                    else
+                        rc = VERR_INVALID_PARAMETER;
                 }
                 else
-                    rc = VERR_INVALID_PARAMETER;
+                    LogRel(("DnD: Path validation for '%s' failed with %Rrc\n", pszPathNew, rc));
 
                 RTStrFree(pszPathNew);
@@ -437 +443 @@
     else
         rc = VERR_NO_MEMORY;
+
+    if (RT_FAILURE(rc))
+        LogRel(("DnD: Rebasing absolute path '%s' (baseOld=%s, baseNew=%s) failed with %Rrc\n",
+                strPathAbs.c_str(), strBaseOld.c_str(), strBaseNew.c_str(), rc));
 
     return rc;