commit b3033247ee68a24a8df14b23d52eb9c6a543be6c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 04 11:09:05 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Aug 08 16:09:44 2014 -0700
tree 59367af58223cae7ce10f560ca391c35bf9c2f94
parent cd613c5008b50c83f3c973443c07297cb22e5eca

table: Fix segfault during Fib::removeNextHopFromAllEntries

Change-Id: I905a3c0da2f2a9197942cfeba7fd698b779e6e4a
Refs: #1816

daemon/table/fib.cpp

diff --git a/daemon/table/fib.cpp b/daemon/table/fib.cpp
index 3672b66..660ae72 100644
--- a/daemon/table/fib.cpp
+++ b/daemon/table/fib.cpp
@@ -144,8 +144,11 @@
 Fib::removeNextHopFromAllEntries(shared_ptr<Face> face)
 {
   for (NameTree::const_iterator it = m_nameTree.fullEnumerate(
-       &predicate_NameTreeEntry_hasFibEntry); it != m_nameTree.end(); ++it) {
+       &predicate_NameTreeEntry_hasFibEntry); it != m_nameTree.end();) {
     shared_ptr<fib::Entry> entry = it->getFibEntry();
+
+    ++it; // need to be advance before `erase`, otherwise the iterator can be invalidated
+
     entry->removeNextHop(face);
     if (!entry->hasNextHops()) {
       this->erase(*entry);