deref iterators before calling methods

Paul · Paul · commit e8a4c505d1d3 · 2018-07-01T22:32:53.000-05:00
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
@@ -90,7 +90,7 @@ bool CZMQNotificationInterface::Initialize()
     auto it=notifiers.begin();
     for (; it!=notifiers.end(); ++it)
     {
-        if (it->Initialize(pcontext))
+        if ((*it)->Initialize(pcontext))
         {
             LogPrint("zmq", "  Notifier %s ready (address = %s)\n", it->GetType(), it->GetAddress());
         }
@@ -118,7 +118,7 @@ void CZMQNotificationInterface::Shutdown()
         for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)
         {
             LogPrint("zmq", "   Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());
-            it->Shutdown();
+            (*it)->Shutdown();
         }
         zmq_ctx_destroy(pcontext);
 
@@ -133,13 +133,13 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co
 
     for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
-        if (it->NotifyBlock(pindexNew))
+        if ((*it)->NotifyBlock(pindexNew))
         {
             it++;
         }
         else
         {
-            it->Shutdown();
+            (*it)->Shutdown();
             it = notifiers.erase(i);
         }
     }
@@ -149,13 +149,13 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB
 {
     for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
-        if (it->NotifyTransaction(tx))
+        if ((*it)->NotifyTransaction(tx))
         {
             it++;
         }
         else
         {
-            it->Shutdown();
+            (*it)->Shutdown();
             it = notifiers.erase(i);
         }
     }
@@ -165,13 +165,13 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)
 {
     for (auto it = notifiers.begin(); it!=notifiers.end(); )
     {
-        if (it->NotifyTransactionLock(tx))
+        if ((*it)->NotifyTransactionLock(tx))
         {
             it++;
         }
         else
         {
-            it->Shutdown();
+            (*it)->Shutdown();
             it = notifiers.erase(i);
         }
     }
@@ -181,13 +181,13 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote
 {
     for (auto it = notifiers.begin(); it != notifiers.end(); )
     {
-        if (it->NotifyGovernanceVote(vote))
+        if ((*it)->NotifyGovernanceVote(vote))
         {
             it++;
         }
         else
         {
-            it->Shutdown();
+            (*it)->Shutdown();
             it = notifiers.erase(i);
         }
     }
@@ -197,13 +197,13 @@ void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &
 {
     for (auto it = notifiers.begin(); it != notifiers.end(); )
     {
-        if (it->NotifyGovernanceObject(object))
+        if ((*it)->NotifyGovernanceObject(object))
         {
             it++;
         }
         else
         {
-            it->Shutdown();
+            (*it)->Shutdown();
             it = notifiers.erase(i);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ bool CZMQNotificationInterface::Initialize()`
`90`	`90`	`auto it=notifiers.begin();`
`91`	`91`	`for (; it!=notifiers.end(); ++it)`
`92`	`92`	`{`
`93`		`- if (it->Initialize(pcontext))`
	`93`	`+ if ((*it)->Initialize(pcontext))`
`94`	`94`	`{`
`95`	`95`	`LogPrint("zmq", " Notifier %s ready (address = %s)\n", it->GetType(), it->GetAddress());`
`96`	`96`	`}`
`@@ -118,7 +118,7 @@ void CZMQNotificationInterface::Shutdown()`
`118`	`118`	`for (auto it=notifiers.begin(); it!=notifiers.end(); ++it)`
`119`	`119`	`{`
`120`	`120`	`LogPrint("zmq", " Shutdown notifier %s at %s\n", it->GetType(), it->GetAddress());`
`121`		`- it->Shutdown();`
	`121`	`+ (*it)->Shutdown();`
`122`	`122`	`}`
`123`	`123`	`zmq_ctx_destroy(pcontext);`
`124`	`124`
`@@ -133,13 +133,13 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, co`
`133`	`133`
`134`	`134`	`for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`135`	`135`	`{`
`136`		`- if (it->NotifyBlock(pindexNew))`
	`136`	`+ if ((*it)->NotifyBlock(pindexNew))`
`137`	`137`	`{`
`138`	`138`	`it++;`
`139`	`139`	`}`
`140`	`140`	`else`
`141`	`141`	`{`
`142`		`- it->Shutdown();`
	`142`	`+ (*it)->Shutdown();`
`143`	`143`	`it = notifiers.erase(i);`
`144`	`144`	`}`
`145`	`145`	`}`
`@@ -149,13 +149,13 @@ void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CB`
`149`	`149`	`{`
`150`	`150`	`for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`151`	`151`	`{`
`152`		`- if (it->NotifyTransaction(tx))`
	`152`	`+ if ((*it)->NotifyTransaction(tx))`
`153`	`153`	`{`
`154`	`154`	`it++;`
`155`	`155`	`}`
`156`	`156`	`else`
`157`	`157`	`{`
`158`		`- it->Shutdown();`
	`158`	`+ (*it)->Shutdown();`
`159`	`159`	`it = notifiers.erase(i);`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -165,13 +165,13 @@ void CZMQNotificationInterface::NotifyTransactionLock(const CTransaction &tx)`
`165`	`165`	`{`
`166`	`166`	`for (auto it = notifiers.begin(); it!=notifiers.end(); )`
`167`	`167`	`{`
`168`		`- if (it->NotifyTransactionLock(tx))`
	`168`	`+ if ((*it)->NotifyTransactionLock(tx))`
`169`	`169`	`{`
`170`	`170`	`it++;`
`171`	`171`	`}`
`172`	`172`	`else`
`173`	`173`	`{`
`174`		`- it->Shutdown();`
	`174`	`+ (*it)->Shutdown();`
`175`	`175`	`it = notifiers.erase(i);`
`176`	`176`	`}`
`177`	`177`	`}`
`@@ -181,13 +181,13 @@ void CZMQNotificationInterface::NotifyGovernanceVote(const CGovernanceVote &vote`
`181`	`181`	`{`
`182`	`182`	`for (auto it = notifiers.begin(); it != notifiers.end(); )`
`183`	`183`	`{`
`184`		`- if (it->NotifyGovernanceVote(vote))`
	`184`	`+ if ((*it)->NotifyGovernanceVote(vote))`
`185`	`185`	`{`
`186`	`186`	`it++;`
`187`	`187`	`}`
`188`	`188`	`else`
`189`	`189`	`{`
`190`		`- it->Shutdown();`
	`190`	`+ (*it)->Shutdown();`
`191`	`191`	`it = notifiers.erase(i);`
`192`	`192`	`}`
`193`	`193`	`}`
`@@ -197,13 +197,13 @@ void CZMQNotificationInterface::NotifyGovernanceObject(const CGovernanceObject &`
`197`	`197`	`{`
`198`	`198`	`for (auto it = notifiers.begin(); it != notifiers.end(); )`
`199`	`199`	`{`
`200`		`- if (it->NotifyGovernanceObject(object))`
	`200`	`+ if ((*it)->NotifyGovernanceObject(object))`
`201`	`201`	`{`
`202`	`202`	`it++;`
`203`	`203`	`}`
`204`	`204`	`else`
`205`	`205`	`{`
`206`		`- it->Shutdown();`
	`206`	`+ (*it)->Shutdown();`
`207`	`207`	`it = notifiers.erase(i);`
`208`	`208`	`}`
`209`	`209`	`}`