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

Timestamp:

Sep 18, 2015 10:37:37 AM (9 years ago)

Author:

vboxsync

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

102775

Message:

DnD: RTUriPath -> RTUriFilePath; fixed memory leak.

File:

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

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

@@ -255 +255 @@
                                 const RTCString &strBaseNew /* = "" */)
 {
+    char *pszPath = RTUriFilePath(strPath.c_str(), URI_FILE_FORMAT_AUTO);
+    if (!pszPath) /* No URI? */
+         pszPath = RTStrDup(strPath.c_str());
+
     int rc;
-    const char *pszPath = RTUriPath(strPath.c_str());
-    if (!pszPath)
-        pszPath = strPath.c_str();
+
     if (pszPath)
     {
@@ -285 +287 @@
                     strPath = RTCString(pszPathURI) + "\r\n";
                     RTStrFree(pszPathURI);
-
-                    rc = VINF_SUCCESS;
                 }
                 else
@@ -296 +296 @@
                 rc = VERR_NO_MEMORY;
         }
+
+        RTStrFree(pszPath);
     }
     else
-        rc = VERR_INVALID_PARAMETER;
+        rc = VERR_NO_MEMORY;
 
     return rc;