Changeset 56184 in vbox for trunk/src

Timestamp:

Jun 1, 2015 2:23:41 PM (10 years ago)

Author:

vboxsync

Message:

DnDURIList: Fixed memory leak in error case.

File:

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

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

@@ -55 +55 @@
     int rc = RTPathQueryInfo(pcszSource, &objInfo, RTFSOBJATTRADD_NOTHING);
     if (RT_SUCCESS(rc))
-    {   
+    {
         if (RTFS_IS_FILE(objInfo.Attr.fMode))
         {
             LogFlowFunc(("File '%s' -> '%s'\n", pcszSource, pcszTarget));
 
-            m_lstTree.append(DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget, 
+            m_lstTree.append(DnDURIObject(DnDURIObject::File, pcszSource, pcszTarget,
                              objInfo.Attr.fMode, (uint64_t)objInfo.cbObject));
             m_cTotal++;
@@ -82 +82 @@
 }
 
-int DnDURIList::appendPathRecursive(const char *pcszSrcPath, 
+int DnDURIList::appendPathRecursive(const char *pcszSrcPath,
                                     const char *pcszDstPath, const char *pcszDstBase, size_t cchDstBase, uint32_t fFlags)
 {
@@ -88 +88 @@
     AssertPtrReturn(pcszDstBase, VERR_INVALID_POINTER);
     AssertPtrReturn(pcszDstPath, VERR_INVALID_POINTER);
-   
-    LogFlowFunc(("pcszSrcPath=%s, pcszDstPath=%s, pcszDstBase=%s, cchDstBase=%zu\n", 
+
+    LogFlowFunc(("pcszSrcPath=%s, pcszDstPath=%s, pcszDstBase=%s, cchDstBase=%zu\n",
                  pcszSrcPath, pcszDstPath, pcszDstBase, cchDstBase));
 
@@ -95 +95 @@
     int rc = RTPathQueryInfo(pcszSrcPath, &objInfo, RTFSOBJATTRADD_NOTHING);
     if (RT_SUCCESS(rc))
-    {   
+    {
         if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
         {
@@ -104 +104 @@
                 rc = RTDirOpen(&hDir, pcszSrcPath);
             if (RT_SUCCESS(rc))
-            {   
+            {
                 do
                 {
@@ -123 +123 @@
                             if (   RTStrCmp(DirEntry.szName, ".")  == 0
                                 || RTStrCmp(DirEntry.szName, "..") == 0)
-                                break;                           
+                                break;
 
                             char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
@@ -176 +176 @@
                                         {
                                             LogFlowFunc(("Directory entry is symlink to directory\n"));
-                                            rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags); 
+                                            rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags);
                                         }
                                         else if (RTFS_IS_FILE(objInfo.Attr.fMode))
@@ -188 +188 @@
 
                                     RTStrFree(pszSrc);
-                                }        
+                                }
                                 else
                                     rc = VERR_NO_MEMORY;
@@ -221 +221 @@
                         {
                             LogFlowFunc(("Symlink to directory\n"));
-                            rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags); 
+                            rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags);
                         }
                         else if (RTFS_IS_FILE(objInfo.Attr.fMode))
@@ -233 +233 @@
 
                     RTStrFree(pszSrc);
-                }        
+                }
                 else
-                    rc = VERR_NO_MEMORY;          
+                    rc = VERR_NO_MEMORY;
             }
         }
@@ -468 +468 @@
                     RTStrFree(pszPathURI);
                 }
-                else
+
+                RTStrFree(pszPath);
+
+                if (!pszPathURI)
                     break;
-                RTStrFree(pszPath);
             }
             else