Merge branch 'FSM' of https://github.com/jl777/komodo

merge
2018-12-15 07:03:32 +08:00
parent 3e7c05f2f0 655ef3c8ae
commit 465fe4af67
19 changed files with 443 additions and 392 deletions
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1506,13 +1506,18 @@ void ThreadOpenAddedConnections()
            LOCK(cs_vNodes);
            BOOST_FOREACH(CNode* pnode, vNodes)
                for (list<vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
+                {
                    BOOST_FOREACH(const CService& addrNode, *(it))
                        if (pnode->addr == addrNode)
                        {
                            it = lservAddressesToAdd.erase(it);
-                            it--;
+                            if ( it != lservAddressesToAdd.begin() )
+                                it--;
                            break;
                        }
+                    if (it == lservAddressesToAdd.end())
+                        break;
+                }
        }
        BOOST_FOREACH(vector<CService>& vserv, lservAddressesToAdd)
        {