Changeset 41441 in vbox

Timestamp:

May 24, 2012 5:26:51 PM (13 years ago)

Author:

vboxsync

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

78172

Message:

VBoxTray/SharedFolders/win: fix double mem free crash

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxSharedFolders.cpp (modified) (2 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp

@@ -36 +36 @@
         rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc) && cMappings)
         {
 #if 0
@@ -144 +144 @@
         rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(rc) && cMappings)
         {
             for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp

@@ -104 +104 @@
     int rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && cMappings)
     {
         for (uint32_t i = 0; i < cMappings && !fFound; i++)
@@ -186 +186 @@
                     ppaMappingsTemp = (PVBGLR3SHAREDFOLDERMAPPING)pvNew;
                 }
-                else
-                    *ppaMappings = ppaMappingsTemp;
             }
         }
@@ -194 +192 @@
     if (   ppaMappingsTemp
         && (RT_FAILURE(rc) || !*pcMappings))
+    {
         RTMemFree(ppaMappingsTemp);
+        ppaMappingsTemp = NULL;
+    }
+
+    *ppaMappings = ppaMappingsTemp;
 
     return rc;