Changeset 75432 in vbox

Timestamp:

Nov 13, 2018 10:32:08 PM (6 years ago)

Author:

vboxsync

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

126585

Message:

SharedFolders/mappings.cpp: Fixed assertion in vbsfRootHandleRemove. bugref:3544

File:

• trunk/src/VBox/HostServices/SharedFolders/mappings.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -197 +197 @@
 static void vbsfRootHandleAdd(SHFLROOT iMapping)
 {
-    unsigned root;
-
-    for (root = 0; root < RT_ELEMENTS(g_aIndexFromRoot); root++)
+    for (unsigned root = 0; root < RT_ELEMENTS(g_aIndexFromRoot); root++)
     {
         if (g_aIndexFromRoot[root] == SHFL_ROOT_NIL)
@@ -214 +212 @@
 static void vbsfRootHandleRemove(SHFLROOT iMapping)
 {
-    unsigned root;
-
-    for (root = 0; root < RT_ELEMENTS(g_aIndexFromRoot); root++)
+    unsigned cFound = 0;
+
+    for (unsigned root = 0; root < RT_ELEMENTS(g_aIndexFromRoot); root++)
     {
         if (g_aIndexFromRoot[root] == iMapping)
@@ -227 +225 @@
                      prior to the introduction of fLoadedRootId) contain
                      duplicates after restoring save state. */
-        }
-    }
-
-    AssertFailed();
+            cFound++;
+        }
+    }
+
+    Assert(cFound > 0); RT_NOREF(cFound);
 }