Ack.
-----Original Message-----
From: Thuan Tran <thuan.t...@dektech.com.au>
Sent: Wednesday, April 1, 2020 2:40 PM
To: Minh Hon Chau <minh.c...@dektech.com.au>; Thang Duc Nguyen
<thang.d.ngu...@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net; Thuan Tran <thuan.t...@dektech.com.au>
Subject: [PATCH 1/1] amfnd: fix coding issues identified by codechecker [#3174]
---
src/amf/amfnd/clc.cc | 1 +
src/amf/amfnd/comp.cc | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/amf/amfnd/clc.cc b/src/amf/amfnd/clc.cc index
f78e1a707..01c041a88 100644
--- a/src/amf/amfnd/clc.cc
+++ b/src/amf/amfnd/clc.cc
@@ -1321,6 +1321,7 @@ uint32_t avnd_comp_clc_st_chng_prc(AVND_CB *cb, AVND_COMP
*comp,
}
csi = m_AVND_CSI_REC_FROM_COMP_DLL_NODE_GET(
m_NCS_DBLIST_FIND_FIRST(&comp->csi_list));
+ osafassert(csi);
// Mark CSI ASSIGNED in case of comp-restart recovery and RESTART admin
op
// on comp.
if ((isRestartSet(comp->su) == false) && diff --git
a/src/amf/amfnd/comp.cc b/src/amf/amfnd/comp.cc index 8a11d75fb..d805346bb
100644
--- a/src/amf/amfnd/comp.cc
+++ b/src/amf/amfnd/comp.cc
@@ -1066,6 +1066,7 @@ uint32_t avnd_comp_csi_assign(AVND_CB *cb, AVND_COMP
*comp,
m_AVND_COMP_ALL_CSI_SET(comp);
curr_csi = m_AVND_CSI_REC_FROM_COMP_DLL_NODE_GET(
m_NCS_DBLIST_FIND_FIRST(&comp->csi_list));
+ osafassert(curr_csi);
if (!m_AVND_COMP_CSI_PRV_ASSIGN_STATE_IS_ASSIGNED(curr_csi)) {
/*
* => prv si assignment did not complete @@ -1163,7 +1164,7 @@
uint32_t avnd_comp_csi_assign(AVND_CB *cb, AVND_COMP *comp,
if (!curr_csi)
curr_csi = m_AVND_CSI_REC_FROM_COMP_DLL_NODE_GET(
m_NCS_DBLIST_FIND_FIRST(&comp->csi_list));
-
+ osafassert(curr_csi);
/* determine the instantiation state of npi comp */
if (!m_AVND_COMP_CSI_PRV_ASSIGN_STATE_IS_ASSIGNED(curr_csi) ||
(m_AVND_COMP_CSI_PRV_ASSIGN_STATE_IS_ASSIGNED(curr_csi) && @@ -1631,7
+1632,7 @@ uint32_t avnd_comp_csi_assign_done(AVND_CB *cb, AVND_COMP *comp,
m_NCS_DBLIST_FIND_FIRST(&comp->csi_list));
csiname = "all CSIs";
}
-
+ osafassert(curr_csi);
LOG_IN("Assigned '%s' %s to '%s'", csiname.c_str(),
ha_state[curr_csi->si->curr_state], comp->name.c_str());
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
