Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp	(revision 40731)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp	(revision 40732)
@@ -161,5 +161,5 @@
     VBGLR3SHAREDFOLDERMAPPING *ppaMappingsTemp = (PVBGLR3SHAREDFOLDERMAPPING)RTMemAllocZ(cbSize);
     if (ppaMappingsTemp == NULL)
-        rc = VERR_NO_MEMORY;
+        return VERR_NO_MEMORY;
 
     *pcMappings = 0;
@@ -192,5 +192,6 @@
     } while (rc == VINF_BUFFER_OVERFLOW);
 
-    if (RT_FAILURE(rc) && ppaMappingsTemp)
+    if (   ppaMappingsTemp
+        && (RT_FAILURE(rc) || !*pcMappings))
         RTMemFree(ppaMappingsTemp);