Changeset 72840 in vbox

Timestamp:

Jul 3, 2018 6:42:06 PM (7 years ago)

Author:

vboxsync

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

123385

Message:

bugref:8345. Fixed wrong manipulation with iterator.

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -63 +63 @@
         filename.stripPath();
         rangeRes_t res = m_list.equal_range(folder);
-        for (it_t it=res.first; it!=res.second; ++it)
-        {
+        for (it_t it=res.first; it!=res.second;)
+        {
+            //until c++11
             if (it->second.equals(filename))
-                m_list.erase(it);
-        }
+                m_list.erase(it++);
+            else
+                ++it;
+        }
+
         return rc;
     }
@@ -75 +79 @@
         HRESULT rc = S_OK;
         rangeRes_t res = m_list.equal_range(path);
-        for (it_t it=res.first; it!=res.second; ++it)
-        {
+        for (it_t it=res.first; it!=res.second;)
+        {
+            //since c++11
             if (it->second.equals(fileName))
-                m_list.erase(it);
+                it = m_list.erase(it);
+            else
+                ++it;
         }
         return rc;