Fix HIGH severity in codechecker report.
---
src/amf/amfd/ndmsg.cc | 4 ++--
src/amf/amfd/ndproc.cc | 4 ++--
src/amf/amfd/timer.cc | 4 ++--
src/amf/amfnd/amfnd.cc | 4 ++--
src/amf/amfnd/mds.cc | 15 ++++++++-------
src/amf/amfnd/su.cc | 2 +-
src/amf/amfnd/tmr.cc | 4 ++--
src/clm/agent/clma_util.cc | 5 +++++
src/clm/apitest/tet_saClmInitialize.cc | 6 ++++--
src/imm/immloadd/imm_pbe_load.cc | 16 ++++++++++++++--
src/imm/immpbed/immpbe_daemon.cc | 18 ++++++++++++++++--
src/imm/tools/imm_admin.c | 8 +++++++-
src/log/apitest/saflogtest.c | 2 +-
src/log/apitest/tet_saLogStreamOpen_2.c | 2 +-
src/log/logd/lgs_clm.cc | 2 ++
src/log/logd/lgs_stream.cc | 2 ++
src/nid/nodeinit.cc | 8 ++++++--
src/ntf/apitest/tet_ntf_common.cc | 2 +-
.../tet_saNtfNotificationReadInitialize.cc | 2 +-
src/ntf/apitest/tet_saNtfNotificationSend.cc | 4 ++--
.../apitest/tet_scOutage_reinitializeHandle.cc | 1 +
src/ntf/ntfimcnd/ntfimcn_imm.c | 4 ++--
src/ntf/tools/ntfsend.c | 5 +++++
src/osaf/immutil/immutil.c | 7 ++++++-
src/smf/smfd/SmfUpgradeProcedure.cc | 18 +++++++++---------
25 files changed, 104 insertions(+), 45 deletions(-)
diff --git a/src/amf/amfd/ndmsg.cc b/src/amf/amfd/ndmsg.cc
index 9bfab6fd8..534e43e82 100644
--- a/src/amf/amfd/ndmsg.cc
+++ b/src/amf/amfd/ndmsg.cc
@@ -362,8 +362,8 @@ uint32_t avd_n2d_msg_rcv(AVD_DND_MSG *rcv_msg, NODE_ID
node_id,
evt->rcv_evt = AVD_EVT_ND_CSICOMP_STATE_INFO_MSG;
break;
default:
- evt->rcv_evt = static_cast<AVD_EVT_TYPE>(
- (rcv_msg->msg_type - AVSV_N2D_NODE_UP_MSG) + AVD_EVT_NODE_UP_MSG);
+ evt->rcv_evt = static_cast<AVD_EVT_TYPE>((int)(
+ (rcv_msg->msg_type - AVSV_N2D_NODE_UP_MSG) + AVD_EVT_NODE_UP_MSG));
break;
}
diff --git a/src/amf/amfd/ndproc.cc b/src/amf/amfd/ndproc.cc
index feebfebba..0acc14154 100644
--- a/src/amf/amfd/ndproc.cc
+++ b/src/amf/amfd/ndproc.cc
@@ -736,8 +736,8 @@ void cluster_startup_expiry_event_generate(AVD_CL_CB *cb) {
cb->amf_init_tmr.type = AVD_TMR_CL_INIT;
evt->info.tmr = cb->amf_init_tmr;
- evt->rcv_evt = static_cast<AVD_EVT_TYPE>(
- (evt->info.tmr.type - AVD_TMR_CL_INIT) + AVD_EVT_TMR_CL_INIT);
+ evt->rcv_evt = static_cast<AVD_EVT_TYPE>((int)(
+ (evt->info.tmr.type - AVD_TMR_CL_INIT) + AVD_EVT_TMR_CL_INIT));
if (m_NCS_IPC_SEND(&cb->avd_mbx, evt, NCS_IPC_PRIORITY_VERY_HIGH) !=
NCSCC_RC_SUCCESS) {
diff --git a/src/amf/amfd/timer.cc b/src/amf/amfd/timer.cc
index 9f6c986d4..8ef4319c7 100644
--- a/src/amf/amfd/timer.cc
+++ b/src/amf/amfd/timer.cc
@@ -166,8 +166,8 @@ void avd_tmr_exp(void *uarg) {
evt = new AVD_EVT();
evt->info.tmr = *tmr;
- evt->rcv_evt = static_cast<AVD_EVT_TYPE>((tmr->type - AVD_TMR_CL_INIT) +
- AVD_EVT_TMR_CL_INIT);
+ evt->rcv_evt = static_cast<AVD_EVT_TYPE>((int)((tmr->type -
AVD_TMR_CL_INIT) +
+ AVD_EVT_TMR_CL_INIT));
if (m_NCS_IPC_SEND(&cb->avd_mbx, evt, NCS_IPC_PRIORITY_VERY_HIGH) !=
NCSCC_RC_SUCCESS) {
diff --git a/src/amf/amfnd/amfnd.cc b/src/amf/amfnd/amfnd.cc
index d861e665c..1066b7697 100644
--- a/src/amf/amfnd/amfnd.cc
+++ b/src/amf/amfnd/amfnd.cc
@@ -138,8 +138,8 @@ uint32_t avnd_evt_avnd_avnd_api_msg_hdl(AVND_CB *cb,
AVND_EVT *evt) {
/* Create AvA message, so that it look like it is coming from AvA. */
evt_type =
- static_cast<AVND_EVT_TYPE>(evt->info.avnd->info.msg->info.api_info.type -
- AVSV_AMF_FINALIZE + AVND_EVT_AVA_FINALIZE);
+
static_cast<AVND_EVT_TYPE>((int)(evt->info.avnd->info.msg->info.api_info.type -
+ AVSV_AMF_FINALIZE + AVND_EVT_AVA_FINALIZE));
evt->info.ava.msg = evt->info.avnd->info.msg;
if (AVND_EVT_AVA_COMP_REG == evt_type) {
diff --git a/src/amf/amfnd/mds.cc b/src/amf/amfnd/mds.cc
index 869c7a02b..930e2a4cc 100644
--- a/src/amf/amfnd/mds.cc
+++ b/src/amf/amfnd/mds.cc
@@ -386,16 +386,16 @@ uint32_t avnd_mds_rcv(AVND_CB *cb,
MDS_CALLBACK_RECEIVE_INFO *rcv_info) {
else if (msg.info.avd->msg_type == AVSV_D2N_CONTAINED_SU_MSG)
type = AVND_EVT_AVD_CONTAINED_SU_MSG;
else
- type = static_cast<AVND_EVT_TYPE>(
+ type = static_cast<AVND_EVT_TYPE>((int_fast32_t)(
(msg.info.avd->msg_type - AVSV_D2N_NODE_UP_MSG) +
- AVND_EVT_AVD_NODE_UP_MSG);
+ AVND_EVT_AVD_NODE_UP_MSG));
break;
case AVND_MSG_AVA:
osafassert(AVSV_AVA_API_MSG == msg.info.ava->type);
- type = static_cast<AVND_EVT_TYPE>(
+ type = static_cast<AVND_EVT_TYPE>((int)(
(msg.info.ava->info.api_info.type - AVSV_AMF_FINALIZE) +
- AVND_EVT_AVA_FINALIZE);
+ AVND_EVT_AVA_FINALIZE));
break;
case AVND_MSG_AVND:
@@ -467,7 +467,7 @@ uint32_t avnd_mds_cpy(AVND_CB *cb, MDS_CALLBACK_COPY_INFO
*cpy_info) {
case NCSMDS_SVC_ID_AVD:
cpy_info->o_msg_fmt_ver =
avnd_avd_msg_fmt_map_table[cpy_info->i_rem_svc_pvt_ver - 1];
- avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
+ rc = avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
cpy_info->o_cpy = (NCSCONTEXT)msg->info.avd;
msg->info.avd = 0;
break;
@@ -476,18 +476,19 @@ uint32_t avnd_mds_cpy(AVND_CB *cb, MDS_CALLBACK_COPY_INFO
*cpy_info) {
case NCSMDS_SVC_ID_AVND_CNTLR:
cpy_info->o_msg_fmt_ver =
avnd_avnd_msg_fmt_map_table[cpy_info->i_rem_svc_pvt_ver - 1];
- avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
+ rc = avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
cpy_info->o_cpy = (NCSCONTEXT)msg->info.avnd;
msg->info.avnd = 0;
break;
case NCSMDS_SVC_ID_AVA:
- avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
+ rc = avnd_msg_copy(cb, msg, (AVND_MSG *)cpy_info->i_msg);
cpy_info->o_cpy = (NCSCONTEXT)msg->info.ava;
msg->info.ava = 0;
break;
default:
+ delete msg;
osafassert(0);
break;
}
diff --git a/src/amf/amfnd/su.cc b/src/amf/amfnd/su.cc
index cb4928d69..3df744ccd 100644
--- a/src/amf/amfnd/su.cc
+++ b/src/amf/amfnd/su.cc
@@ -416,7 +416,7 @@ uint32_t avnd_evt_avd_info_su_si_assign_evh(AVND_CB *cb,
AVND_EVT *evt) {
/* indicate that capability is invalid for later use when
* creating CSI_REC */
for (csi = info->list; csi != nullptr; csi = csi->next) {
- csi->capability = (SaAmfCompCapabilityModelT)~0;
+ csi->capability = (SaAmfCompCapabilityModelT)((int)~0);
}
/* SI rank is uninitialized, read it from IMM */
diff --git a/src/amf/amfnd/tmr.cc b/src/amf/amfnd/tmr.cc
index 678e8cbf1..9e8aa5fb6 100644
--- a/src/amf/amfnd/tmr.cc
+++ b/src/amf/amfnd/tmr.cc
@@ -150,8 +150,8 @@ void avnd_tmr_exp(void *uarg) {
if (AVND_TMR_QSCING_CMPL_RESP == tmr->type) {
type = AVND_EVT_TMR_QSCING_CMPL;
} else {
- type = static_cast<AVND_EVT_TYPE>((tmr->type - AVND_TMR_HC) +
- AVND_EVT_TMR_HC);
+ type = static_cast<AVND_EVT_TYPE>((int)((tmr->type - AVND_TMR_HC) +
+ AVND_EVT_TMR_HC));
}
/* create & send the timer event */
diff --git a/src/clm/agent/clma_util.cc b/src/clm/agent/clma_util.cc
index 6feabcbeb..32ac7852d 100644
--- a/src/clm/agent/clma_util.cc
+++ b/src/clm/agent/clma_util.cc
@@ -440,6 +440,11 @@ static SaAisErrorT clma_hdl_cbk_rec_prc(clma_cb_t *cb,
CLMSV_MSG *msg,
if (reg_cbk->saClmClusterNodeGetCallback) {
SaClmClusterNodeT *node =
(SaClmClusterNodeT *)malloc(sizeof(SaClmClusterNodeT));
+ if (node == nullptr) {
+ LOG_ER("malloc() error");
+ rc = SA_AIS_ERR_NO_MEMORY;
+ break;
+ }
clma_fill_node_from_node4(node, cbk_info->param.node_get.info);
reg_cbk->saClmClusterNodeGetCallback(
cbk_info->param.node_get.inv, node,
cbk_info->param.node_get.err);
diff --git a/src/clm/apitest/tet_saClmInitialize.cc
b/src/clm/apitest/tet_saClmInitialize.cc
index b5c4ec0d7..97d3e43ff 100644
--- a/src/clm/apitest/tet_saClmInitialize.cc
+++ b/src/clm/apitest/tet_saClmInitialize.cc
@@ -107,14 +107,16 @@ void saClmInitialize_12() {
/*for code coverage*/
void saClmInitialize_13() {
- SaClmHandleT clmHandle1, clmHandle2, clmHandle3;
+ SaClmHandleT clmHandle1(0), clmHandle2(0), clmHandle3(0);
rc = ClmTest::saClmInitialize(&clmHandle1, &clmCallbacks_1, &clmVersion_1);
+ test_validate(rc, SA_AIS_OK);
rc = ClmTest::saClmInitialize(&clmHandle2, &clmCallbacks_1, &clmVersion_1);
+ test_validate(rc, SA_AIS_OK);
rc = ClmTest::saClmInitialize(&clmHandle3, &clmCallbacks_1, &clmVersion_1);
+ test_validate(rc, SA_AIS_OK);
safassert(ClmTest::saClmFinalize(clmHandle1), SA_AIS_OK);
safassert(ClmTest::saClmFinalize(clmHandle2), SA_AIS_OK);
safassert(ClmTest::saClmFinalize(clmHandle3), SA_AIS_OK);
- test_validate(rc, SA_AIS_OK);
}
#if 0
void saClmInitialize_13()
diff --git a/src/imm/immloadd/imm_pbe_load.cc b/src/imm/immloadd/imm_pbe_load.cc
index 945aff718..3fd9fde5c 100644
--- a/src/imm/immloadd/imm_pbe_load.cc
+++ b/src/imm/immloadd/imm_pbe_load.cc
@@ -550,7 +550,13 @@ bool loadObjectFromPbe(void *pbeHandle, SaImmHandleT
immHandle,
int size = snprintf(val, 30, "%.17g", dbl);
size++;
if (size > 30) {
- val = (char *)realloc(val, size);
+ char *tmp = (char *)realloc(val, size);
+ if (tmp == nullptr) {
+ LOG_ER("realloc() failed");
+ if (val) free(val);
+ return false;
+ }
+ val = tmp;
snprintf(val, size, "%.17g", dbl);
}
} else {
@@ -649,7 +655,13 @@ bool loadObjectFromPbe(void *pbeHandle, SaImmHandleT
immHandle,
int size = snprintf(val, 30, "%.17g", d);
size++;
if (size > 30) {
- val = (char *)realloc(val, size);
+ char *tmp = (char *)realloc(val, size);
+ if (tmp == nullptr) {
+ LOG_ER("realloc() failed");
+ if (val) free(val);
+ return false;
+ }
+ val = tmp;
snprintf(val, size, "%.17g", d);
}
attrValueBuffers.push_back(val);
diff --git a/src/imm/immpbed/immpbe_daemon.cc b/src/imm/immpbed/immpbe_daemon.cc
index 1f57d9c5a..ad6383775 100644
--- a/src/imm/immpbed/immpbe_daemon.cc
+++ b/src/imm/immpbed/immpbe_daemon.cc
@@ -1237,8 +1237,15 @@ static void saImmOiAdminOperationCallback(
while (params[i]) {
if ((strcmp(params[i]->paramName, SA_IMM_PARAM_ADMOP_NAME)) == 0) {
param_len++;
- rparams = (SaImmAdminOperationParamsT_2 **)realloc(
+ SaImmAdminOperationParamsT_2 **tmp = (SaImmAdminOperationParamsT_2
**)realloc(
rparams, (param_len + 1) * sizeof(SaImmAdminOperationParamsT_2 *));
+ if (tmp == nullptr) {
+ LOG_ER("realloc() failed");
+ rc = SA_AIS_ERR_NO_RESOURCES;
+ if (rparams) free(rparams);
+ goto fail;
+ }
+ rparams = tmp;
resparams = (SaImmAdminOperationParamsT_2 *)malloc(
sizeof(SaImmAdminOperationParamsT_2));
opName = (*(SaStringT *)params[i]->paramBuffer);
@@ -1256,8 +1263,15 @@ static void saImmOiAdminOperationCallback(
while (params[i]) {
if ((strcmp(params[i]->paramName, "resource")) == 0) {
param_len++;
- rparams = (SaImmAdminOperationParamsT_2 **)realloc(
+ SaImmAdminOperationParamsT_2 **tmp = (SaImmAdminOperationParamsT_2
**)realloc(
rparams, (param_len + 1) * sizeof(SaImmAdminOperationParamsT_2 *));
+ if (tmp == nullptr) {
+ LOG_ER("realloc() failed");
+ rc = SA_AIS_ERR_NO_RESOURCES;
+ if (rparams) free(rparams);
+ goto fail;
+ }
+ rparams = tmp;
resparams = (SaImmAdminOperationParamsT_2 *)malloc(
sizeof(SaImmAdminOperationParamsT_2));
res = (*(SaStringT *)params[i]->paramBuffer);
diff --git a/src/imm/tools/imm_admin.c b/src/imm/tools/imm_admin.c
index 283ee71c9..1d908f53e 100644
--- a/src/imm/tools/imm_admin.c
+++ b/src/imm/tools/imm_admin.c
@@ -351,9 +351,15 @@ int main(int argc, char *argv[])
break;
case 'p':
params_len++;
- params = realloc(
+ const SaImmAdminOperationParamsT_2 **tmp = realloc(
params, (params_len + 1) *
sizeof(SaImmAdminOperationParamsT_2 *));
+ if (tmp == NULL){
+ fprintf(stderr, "realloc() error");
+ if (params) free(params);
+ exit(EXIT_FAILURE);
+ }
+ params = tmp;
param = malloc(sizeof(SaImmAdminOperationParamsT_2));
params[params_len - 1] = param;
params[params_len] = NULL;
diff --git a/src/log/apitest/saflogtest.c b/src/log/apitest/saflogtest.c
index 80cbadee5..d4efa891d 100644
--- a/src/log/apitest/saflogtest.c
+++ b/src/log/apitest/saflogtest.c
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
int interval = 0;
char hostname[_POSIX_HOST_NAME_MAX];
int write_count = 1;
- SaAisErrorT error;
+ SaAisErrorT error = SA_AIS_ERR_TRY_AGAIN;
SaLogHandleT logHandle;
SaLogStreamHandleT logStreamHandle;
SaSelectionObjectT selectionObject;
diff --git a/src/log/apitest/tet_saLogStreamOpen_2.c
b/src/log/apitest/tet_saLogStreamOpen_2.c
index 835b9b5da..01c37e48f 100644
--- a/src/log/apitest/tet_saLogStreamOpen_2.c
+++ b/src/log/apitest/tet_saLogStreamOpen_2.c
@@ -870,7 +870,7 @@ void *saLogInitialize_1(void *arg)
{
SaAisErrorT *rt = (SaAisErrorT *)arg;
SaLogStreamHandleT logStreamHandle1;
- SaLogHandleT logHandle1;
+ SaLogHandleT logHandle1 = 0;
int time_wait = 20*1000; // Wait for timeout is 20 seconds
SaVersionT log_version;
diff --git a/src/log/logd/lgs_clm.cc b/src/log/logd/lgs_clm.cc
index 1a4af8c45..ed502b0d1 100644
--- a/src/log/logd/lgs_clm.cc
+++ b/src/log/logd/lgs_clm.cc
@@ -111,10 +111,12 @@ static uint32_t lgs_clm_node_add(NODE_ID clm_node_id) {
if (!p.second) {
TRACE("unable to add clm node info map - the id %x already existed",
clm_node->clm_node_id);
+ delete clm_node;
rc = NCSCC_RC_FAILURE;
}
} else {
TRACE("can't find local sec map in lgs_clm_node_add");
+ delete clm_node;
rc = NCSCC_RC_FAILURE;
}
TRACE_LEAVE();
diff --git a/src/log/logd/lgs_stream.cc b/src/log/logd/lgs_stream.cc
index 73bd7b2da..c878a27e1 100644
--- a/src/log/logd/lgs_stream.cc
+++ b/src/log/logd/lgs_stream.cc
@@ -782,6 +782,8 @@ int log_file_open(const std::string &root_path,
log_stream_t *stream,
TRACE("%s - Opening file \"%s\"", __FUNCTION__, pathname.c_str());
fd = fileopen_h(pathname, &errno_ret);
+ if (fd == -1) return fd;
+
if (errno_save != 0) {
*errno_save = errno_ret;
}
diff --git a/src/nid/nodeinit.cc b/src/nid/nodeinit.cc
index 2832a3eba..76bf15293 100644
--- a/src/nid/nodeinit.cc
+++ b/src/nid/nodeinit.cc
@@ -599,6 +599,10 @@ uint32_t parse_nodeinit_conf(char *strbuf) {
if (fscanf(ntfile, "%s", tmp) > 0) {
/* Form complete name of nodeinit.conf.<controller or payload>. */
snprintf(nidconf, sizeof(nidconf), NID_PLAT_CONF ".%s", tmp);
+ } else {
+ LOG_ER("fscanf() error");
+ (void)fclose(ntfile);
+ return NCSCC_RC_FAILURE;
}
(void)fclose(ntfile);
@@ -1188,7 +1192,7 @@ static pid_t get_pid_from_file(const char *service_name) {
if (fscanf(f, "%d", &pid) == 0) {
LOG_WA("Could not read PID from file %s", pid_file);
- return -1;
+ pid = -1;
}
if (fclose(f) != 0) {
@@ -1323,7 +1327,7 @@ uint32_t recovery_action(NID_SPAWN_INFO *service, char
*strbuff, int reason) {
if (service->recovery_matrix[opt].retry_count == 0) {
if (count != 0) LOG_ER("%s", nid_recerr[opt][3]);
- opt = static_cast<NID_RECOVERY_OPT>(static_cast<int>(opt) + 1);
+ opt = static_cast<NID_RECOVERY_OPT>((int)(static_cast<int>(opt) + 1));
continue;
}
}
diff --git a/src/ntf/apitest/tet_ntf_common.cc
b/src/ntf/apitest/tet_ntf_common.cc
index c04f4895d..acb8c0b5a 100644
--- a/src/ntf/apitest/tet_ntf_common.cc
+++ b/src/ntf/apitest/tet_ntf_common.cc
@@ -681,7 +681,7 @@ void fillHeader(SaNtfNotificationHeaderT *head) {
(SaUint16T)(strlen(DEFAULT_ADDITIONAL_TEXT) + 1));
for (i = 0; i < head->numCorrelatedNotifications; i++) {
- head->correlatedNotifications[i] = (SaNtfIdentifierT)(i + 400);
+ head->correlatedNotifications[i] = (SaNtfIdentifierT)(((int)i + 400));
}
for (i = 0; i < head->numAdditionalInfo; i++) {
diff --git a/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
b/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
index da7c761e5..e72542344 100644
--- a/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
+++ b/src/ntf/apitest/tet_saNtfNotificationReadInitialize.cc
@@ -114,7 +114,7 @@ void saNtfNotificationReadInitialize_01_7(void) {
void saNtfNotificationReadInitialize_01_8(void) {
saNtfNotificationReadInitialize_01(
- static_cast<SaNtfSearchModeT>(SA_NTF_SEARCH_ONLY_FILTER + 10),
+ static_cast<SaNtfSearchModeT>((int)(SA_NTF_SEARCH_ONLY_FILTER + 10)),
SA_AIS_ERR_INVALID_PARAM);
}
diff --git a/src/ntf/apitest/tet_saNtfNotificationSend.cc
b/src/ntf/apitest/tet_saNtfNotificationSend.cc
index 9bfcd8db8..849b978e0 100644
--- a/src/ntf/apitest/tet_saNtfNotificationSend.cc
+++ b/src/ntf/apitest/tet_saNtfNotificationSend.cc
@@ -323,7 +323,7 @@ void attr_ch_send(int wrongAttrType, SaAisErrorT
expectedStatus) {
myNotificationParams.changedAttributes[0].attributeType;
if (wrongAttrType)
myNotification.changedAttributes[0].attributeType =
- static_cast<SaNtfValueTypeT>(SA_NTF_VALUE_ARRAY + 1);
+ static_cast<SaNtfValueTypeT>((int)(SA_NTF_VALUE_ARRAY + 1));
myNotification.changedAttributes[0].newAttributeValue.int64Val =
myNotificationParams.changedAttributes[0]
@@ -565,7 +565,7 @@ void sec_al_send(int wrongValueType, SaAisErrorT
expectedStatus) {
myNotificationParams.securityAlarmDetector.value.int32Val;
if (wrongValueType)
myNotification.securityAlarmDetector->valueType =
- static_cast<SaNtfValueTypeT>(SA_NTF_VALUE_ARRAY + 1);
+ static_cast<SaNtfValueTypeT>((int)(SA_NTF_VALUE_ARRAY + 1));
/* set additional text and additional info */
(void)strncpy(myNotification.notificationHeader.additionalText,
myNotificationParams.additionalText,
diff --git a/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
b/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
index 540f3f3bf..079d6e5e1 100644
--- a/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
+++ b/src/ntf/apitest/tet_scOutage_reinitializeHandle.cc
@@ -963,6 +963,7 @@ void reader_life_cycle(int test_api) {
SaNtfSearchCriteriaT searchCriteria;
SaNtfNotificationsT returnedNotification;
+ memset(&searchCriteria, '\0', sizeof(SaNtfSearchCriteriaT));
fprintf_v(stdout, "\nStart test API: %s",
ntf_api_name_list[test_api].apiName);
resetCounters();
diff --git a/src/ntf/ntfimcnd/ntfimcn_imm.c b/src/ntf/ntfimcnd/ntfimcn_imm.c
index b36b18747..ca6334dc4 100644
--- a/src/ntf/ntfimcnd/ntfimcn_imm.c
+++ b/src/ntf/ntfimcnd/ntfimcn_imm.c
@@ -96,7 +96,7 @@ static SaAisErrorT getClassDescription(const SaImmClassNameT
className,
SaImmClassCategoryT classCategory;
struct timespec timeout_ts;
struct timespec delay_ts;
- SaAisErrorT ais_rc;
+ SaAisErrorT ais_rc = SA_AIS_OK;
osaf_millis_to_timespec(sleep_delay_ms, &delay_ts);
osaf_set_millis_timeout(max_waiting_time_7s, &timeout_ts);
@@ -986,7 +986,7 @@ static bool initializeImmOmHandle(SaImmHandleT*
immOmHandle) {
static void finalizeImmOmHandle(SaImmHandleT immOmHandle) {
struct timespec timeout_ts;
struct timespec delay_ts;
- SaAisErrorT ais_rc;
+ SaAisErrorT ais_rc = SA_AIS_OK;
osaf_millis_to_timespec(sleep_delay_ms, &delay_ts);
osaf_set_millis_timeout(max_waiting_time_60s, &timeout_ts);
diff --git a/src/ntf/tools/ntfsend.c b/src/ntf/tools/ntfsend.c
index 43c8f3138..b2c9aa024 100644
--- a/src/ntf/tools/ntfsend.c
+++ b/src/ntf/tools/ntfsend.c
@@ -403,6 +403,11 @@ static SaAisErrorT sendNotification(
/* Instantiate a security alarm notification struct */
SaNtfSecurityAlarmNotificationT mySecurityAlarmNotification;
+ memset(&myAlarmNotification, '\0', sizeof(SaNtfAlarmNotificationT));
+ memset(&myStateChangeNotification, '\0',
sizeof(SaNtfStateChangeNotificationT));
+ memset(&myObjectCreateDeleteNotification, '\0',
sizeof(SaNtfObjectCreateDeleteNotificationT));
+ memset(&myAttributeChangeNotification, '\0',
sizeof(SaNtfAttributeChangeNotificationT));
+ memset(&mySecurityAlarmNotification, '\0',
sizeof(SaNtfSecurityAlarmNotificationT));
unsigned int repeat = notificationParams->repeateSends;
errorCode = ntftool_saNtfInitialize(&ntfHandle, NULL, &version);
diff --git a/src/osaf/immutil/immutil.c b/src/osaf/immutil/immutil.c
index 5c1973b3b..1ca1fbbcc 100644
--- a/src/osaf/immutil/immutil.c
+++ b/src/osaf/immutil/immutil.c
@@ -363,7 +363,12 @@ char const *immutil_getDnItem(SaNameT const *name,
unsigned int index)
assert(objName != NULL);
size = strlen(objName) + 1;
- buffer = realloc(buffer, size);
+ buffer = realloc(NULL, size);
+ if (buffer == NULL) {
+ LOG_ER("realloc() error");
+ return NULL;
+ }
+
memcpy(buffer, objName, size);
value = buffer;
cp = strchr(value, ',');
diff --git a/src/smf/smfd/SmfUpgradeProcedure.cc
b/src/smf/smfd/SmfUpgradeProcedure.cc
index f8aac815c..fae0af596 100644
--- a/src/smf/smfd/SmfUpgradeProcedure.cc
+++ b/src/smf/smfd/SmfUpgradeProcedure.cc
@@ -607,7 +607,7 @@ bool SmfUpgradeProcedure::calculateRollingSteps(
newStep->setDn(newStep->getRdn() + "," + getDn());
unitNameAndState tmp;
tmp.name = *it;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addActivationUnit(tmp);
newStep->addDeactivationUnit(tmp);
newStep->setMaxRetry(i_rollingUpgrade->getStepMaxRetryCount());
@@ -673,7 +673,7 @@ bool SmfUpgradeProcedure::calculateRollingSteps(
newStep->setDn(newStep->getRdn() + "," + getDn());
unitNameAndState tmp;
tmp.name = *itActDeact;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addActivationUnit(tmp);
newStep->addDeactivationUnit(tmp);
newStep->setMaxRetry(i_rollingUpgrade->getStepMaxRetryCount());
@@ -907,7 +907,7 @@ bool SmfUpgradeProcedure::calculateSingleStep(
for (const auto &a : actUnits) {
unitNameAndState tmp;
tmp.name = a;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addActivationUnit(tmp);
}
} else {
@@ -932,7 +932,7 @@ bool SmfUpgradeProcedure::calculateSingleStep(
for (auto &entity : entityList) {
unitNameAndState tmp;
tmp.name = entity;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addActivationUnit(tmp);
}
entityList.clear();
@@ -981,7 +981,7 @@ bool SmfUpgradeProcedure::calculateSingleStep(
for (const auto &a : deactUnits) {
unitNameAndState tmp;
tmp.name = a;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addDeactivationUnit(tmp);
}
} else {
@@ -1019,7 +1019,7 @@ bool SmfUpgradeProcedure::calculateSingleStep(
for (const auto &entity : entityList) {
unitNameAndState tmp;
tmp.name = entity;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addDeactivationUnit(tmp);
}
entityList.clear();
@@ -1121,7 +1121,7 @@ bool SmfUpgradeProcedure::calculateSingleStep(
for (const auto &a : actDeactUnits) {
unitNameAndState tmp;
tmp.name = a;
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
newStep->addDeactivationUnit(tmp);
newStep->addActivationUnit(tmp);
}
@@ -3540,7 +3540,7 @@ SaAisErrorT SmfUpgradeProcedure::readCampaignImmModel(
TRACE("addActivationUnit %s", osaf_extended_name_borrow(au));
unitNameAndState tmp;
tmp.name = osaf_extended_name_borrow(au);
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
if (tmp.name != "") {
i_newStep->addActivationUnit(tmp);
} else {
@@ -3641,7 +3641,7 @@ SaAisErrorT SmfUpgradeProcedure::readCampaignImmModel(
TRACE("addDeactivationUnit %s", osaf_extended_name_borrow(du));
unitNameAndState tmp;
tmp.name = osaf_extended_name_borrow(du);
- tmp.initState = SA_AMF_ADMIN_UNLOCKED;
+ tmp.currentState = tmp.initState = SA_AMF_ADMIN_UNLOCKED;
if (tmp.name != "") {
i_newStep->addDeactivationUnit(tmp);
} else {
--
2.25.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
