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

Timestamp:

Mar 10, 2014 1:54:03 PM (11 years ago)

Author:

vboxsync

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

92721

Message:

DnD: Bugfixes.

File:

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

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

@@ -410 +410 @@
     AssertPtrReturn(pszURI, VERR_INVALID_POINTER);
 
+    /** @todo Check for string termination?  */
 #ifdef DEBUG_andy
     LogFlowFunc(("pszPath=%s, fFlags=0x%x\n", pszURI, fFlags));
@@ -422 +423 @@
         /* Add the path to our internal file list (recursive in
          * the case of a directory). */
-        char *pszFileName = RTPathFilename(pszFilePath);
-        if (pszFileName)
-        {
-            Assert(pszFileName >= pszFilePath);
-            char *pszRoot = &pszFilePath[pszFileName - pszFilePath];
-            m_lstRoot.append(pszRoot);
-#ifdef DEBUG_andy
-            LogFlowFunc(("pszFilePath=%s, pszFileName=%s, pszRoot=%s\n",
-                         pszFilePath, pszFileName, pszRoot));
-#endif
-            rc = appendPathRecursive(pszFilePath,
-                                     pszFileName - pszFilePath,
-                                     fFlags);
+        size_t cbPathLen = RTPathStripTrailingSlash(pszFilePath);
+        if (cbPathLen)
+        {
+            char *pszFileName = RTPathFilename(pszFilePath);
+            if (pszFileName)
+            {
+                Assert(pszFileName >= pszFilePath);
+                char *pszRoot = &pszFilePath[pszFileName - pszFilePath];
+                m_lstRoot.append(pszRoot);
+#ifdef DEBUG_andy
+                LogFlowFunc(("pszFilePath=%s, pszFileName=%s, pszRoot=%s\n",
+                             pszFilePath, pszFileName, pszRoot));
+#endif
+                rc = appendPathRecursive(pszFilePath,
+                                         pszFileName - pszFilePath,
+                                         fFlags);
+            }
+            else
+                rc = VERR_NOT_FOUND;
         }
         else
-            rc = VERR_NOT_FOUND;
+            rc = VERR_INVALID_PARAMETER;
 
         RTStrFree(pszFilePath);