Hi Hans,

Ack (Code review only)

Regards,
Ravi
----- Original Message -----
From: hans.nordeb...@ericsson.com
To: gary....@dektech.com.au, ravisekhar.ko...@oracle.com
Cc: opensaf-devel@lists.sourceforge.net, hans.nordeb...@ericsson.com
Sent: Monday, October 30, 2017 8:27:49 PM GMT +05:30 Chennai, Kolkata, Mumbai, 
New Delhi
Subject: [PATCH 1/1] amfnd: fix segv in ncs_tmr_stop V2 [#2658]

---
 src/amf/amfnd/di.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amf/amfnd/di.cc b/src/amf/amfnd/di.cc
index 7aac34260..2043c6064 100644
--- a/src/amf/amfnd/di.cc
+++ b/src/amf/amfnd/di.cc
@@ -1300,13 +1300,14 @@ void avnd_di_msg_ack_process(AVND_CB *cb, uint32_t mid) 
{
 
     // matching record
     if (msg_id == mid) {
+      cb->dnd_list.erase(iter);
+      // iter is now invalid, exit iterator loop asap
       if (rec->msg.info.avd->msg_type == AVSV_N2D_NODE_DOWN_MSG) {
         // first to stop timer to avoid processing timeout event
         // then perform last step clean up
         avnd_stop_tmr(cb, &rec->resp_tmr);
         avnd_last_step_clean(cb);
       }
-      cb->dnd_list.erase(iter);
       TRACE("remove msg %u from queue", msg_id);
       avnd_diq_rec_del(cb, rec);
       break;
-- 
2.14.2


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to