commit 8e131fd1d31a89b8e6e95a2728457463f0b02e58
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Dec 15 21:31:50 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Dec 15 23:10:15 2014 -0800
tree be2a5f4d68eebec387db6a69933a022d687e0c71
parent 0fa284566a7d9adba766b30edc3b7f0adae92bb5

util: Fix incorrect iteration over entries in InMemoryStorage

Change-Id: I975b1160570ccf6f1d9f46b0e04bc6f5d04b4675
Refs: #2301, #2149

src/util/in-memory-storage.cpp

diff --git a/src/util/in-memory-storage.cpp b/src/util/in-memory-storage.cpp
index d294dd6..9c3146f 100644
--- a/src/util/in-memory-storage.cpp
+++ b/src/util/in-memory-storage.cpp
@@ -104,8 +104,7 @@
   // evict all items from cache
   Cache::iterator it = m_cache.begin();
   while (it != m_cache.end()) {
-    freeEntry(it);
-    it++;
+    it = freeEntry(it);
   }
 
   BOOST_ASSERT(m_freeEntries.size() == m_capacity);
@@ -319,13 +318,14 @@
   return 0;
 }
 
-void
-InMemoryStorage::freeEntry(Cache::index<byFullName>::type::iterator it) {
+InMemoryStorage::Cache::iterator
+InMemoryStorage::freeEntry(Cache::iterator it)
+{
   //push the *empty* entry into mem pool
   (*it)->release();
   m_freeEntries.push(*it);
   m_nPackets--;
-  m_cache.get<byFullName>().erase(it);
+  return m_cache.erase(it);
 }
 
 void
@@ -334,14 +334,10 @@
   if (isPrefix) {
     Cache::index<byFullName>::type::iterator it = m_cache.get<byFullName>().lower_bound(prefix);
 
-    if (it == m_cache.get<byFullName>().end())
-      return;
-
     while (it != m_cache.get<byFullName>().end() && prefix.isPrefixOf((*it)->getName())) {
       //let derived class do something with the entry
       beforeErase(*it);
-      freeEntry(it);
-      it++;
+      it = freeEntry(it);
     }
   }
   else {