[Xorp-cvs] SF.net SVN: xorp:[11561] trunk/xorp/contrib/olsr/external.cc

[bms_fbsd at users.sourceforge.net]

Revision: 11561
          http://xorp.svn.sourceforge.net/xorp/?rev=11561&view=rev
Author:   bms_fbsd
Date:     2009-09-30 23:40:52 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
Actually increment iterator when processing multiple incoming
HNA entries. jj is invalidated when erased, but we break right away
on a match, so this is OK.

Submitted by:	Ben Greear

Modified Paths:
--------------
    trunk/xorp/contrib/olsr/external.cc

Modified: trunk/xorp/contrib/olsr/external.cc
===================================================================
--- trunk/xorp/contrib/olsr/external.cc	2009-09-30 22:15:31 UTC (rev 11560)
+++ trunk/xorp/contrib/olsr/external.cc	2009-09-30 23:40:52 UTC (rev 11561)
@@ -242,9 +242,9 @@
 	 ExternalDestInMap::iterator> rd =
 	_routes_in_by_dest.equal_range(er->dest());
     ExternalDestInMap::iterator jj;
-    for (jj = rd.first; jj != rd.second; ) {
+    for (jj = rd.first; jj != rd.second; jj++) {
 	if ((*jj).second == erid) {
-	    _routes_in_by_dest.erase(jj);
+	    _routes_in_by_dest.erase(jj);   // jj now invalidated; break.
 	    break;
 	}
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.