osaf/services/saf/amf/amfnd/comp.cc | 16 ++++++---------- osaf/services/saf/amf/amfnd/compdb.cc | 20 +++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-)
* Dereference after null check (FORWARD_NULL) * Logically dead code (DEADCODE) * Uninitialized scalar variable (UNINIT) diff --git a/osaf/services/saf/amf/amfnd/comp.cc b/osaf/services/saf/amf/amfnd/comp.cc --- a/osaf/services/saf/amf/amfnd/comp.cc +++ b/osaf/services/saf/amf/amfnd/comp.cc @@ -694,8 +694,11 @@ m_AVND_SEND_CKPT_UPDT_ASYNC_UPDT(cb, comp, AVND_CKPT_COMP_FLAG_CHANGE); /* if proxied comp, do add to the pxied_list of pxy */ - if (m_AVND_COMP_TYPE_IS_PROXIED(comp)) + if (m_AVND_COMP_TYPE_IS_PROXIED(comp)) { + /* do a sanity check as this is a proxied component */ + osafassert(pxy_comp); rc = avnd_comp_proxied_add(cb, comp, pxy_comp, true); + } if (rc != NCSCC_RC_SUCCESS) goto done; @@ -785,12 +788,9 @@ api_info.param.unreg.comp_name.length = comp->name.length; memcpy(api_info.param.unreg.comp_name.value, comp->name.value, api_info.param.unreg.comp_name.length); - api_info.param.unreg.comp_name.length = api_info.param.unreg.comp_name.length; api_info.param.unreg.proxy_comp_name.length = pxy_comp->name.length; memcpy(api_info.param.unreg.proxy_comp_name.value, pxy_comp->name.value, api_info.param.unreg.proxy_comp_name.length); - api_info.param.unreg.proxy_comp_name.length = - api_info.param.unreg.proxy_comp_name.length; rc = avnd_int_ext_comp_hdlr(cb, &api_info, &ctxt, &amf_rc, &int_ext_comp); /* Since there is no Mds Context information being sent so, no response @@ -897,11 +897,11 @@ bool rc = false; SaAisErrorT error; SaNameT dn; - SaImmAccessorHandleT accessorHandle; + SaImmAccessorHandleT accessorHandle = 0; const SaImmAttrValuesT_2 **attributes; SaAmfCompCapabilityModelT comp_cap; SaImmAttrNameT attributeNames[2] = {const_cast<SaImmAttrNameT>("saAmfCtCompCapability"), NULL}; - SaImmHandleT immOmHandle; + SaImmHandleT immOmHandle = 0; SaVersionT immVersion = { 'A', 2, 1 }; TRACE_ENTER2("comptype = '%s' : csitype = '%s'", comp_type->value, csi_type->value); @@ -2338,14 +2338,10 @@ api_info.param.unreg.comp_name.length = pxd_comp->name.length; memcpy(api_info.param.unreg.comp_name.value, pxd_comp->name.value, api_info.param.unreg.comp_name.length); - api_info.param.unreg.comp_name.length = - api_info.param.unreg.comp_name.length; api_info.param.unreg.proxy_comp_name.length = pxd_comp->pxy_comp->name.length; memcpy(api_info.param.unreg.proxy_comp_name.value, pxd_comp->pxy_comp->name.value, api_info.param.unreg.proxy_comp_name.length); - api_info.param.unreg.proxy_comp_name.length = - api_info.param.unreg.proxy_comp_name.length; rc = avnd_int_ext_comp_hdlr(cb, &api_info, &ctxt, &amf_rc, &int_ext_comp); /* Since there is no Mds Context information being sent so, no response diff --git a/osaf/services/saf/amf/amfnd/compdb.cc b/osaf/services/saf/amf/amfnd/compdb.cc --- a/osaf/services/saf/amf/amfnd/compdb.cc +++ b/osaf/services/saf/amf/amfnd/compdb.cc @@ -121,7 +121,7 @@ { SaAisErrorT rc = SA_AIS_ERR_FAILED_OPERATION; const SaImmAttrValuesT_2 **attributes; - SaImmAccessorHandleT accessorHandle; + SaImmAccessorHandleT accessorHandle = 0; SaNameT dn = {0, "safRdn=compGlobalAttributes,safApp=safAmfService" }; TRACE_ENTER(); @@ -186,7 +186,7 @@ { NCS_PATRICIA_PARAMS params = {0}; uint32_t rc; - SaImmHandleT immOmHandle; + SaImmHandleT immOmHandle = 0; SaVersionT immVersion = { 'A', 2, 1 }; TRACE_ENTER(); @@ -510,7 +510,6 @@ /* extract the su-name from comp dn */ memset(&su_name, 0, sizeof(SaNameT)); avsv_cpy_SU_DN_from_DN(&su_name, name); - su_name.length = su_name.length; /* get the su record */ su = m_AVND_SUDB_REC_GET(cb->sudb, su_name); @@ -665,7 +664,6 @@ avsv_cpy_SU_DN_from_DN(&su_name, ¶m->name); /* get the su record */ - su_name.length = su_name.length; su = m_AVND_SUDB_REC_GET(cb->sudb, su_name); if (!su) { LOG_ER("no su in database for the comp %s", param->name.value); @@ -865,12 +863,12 @@ { int arg_counter; char *argv; - TRACE_ENTER2("'%s'", compt->name.value); if (!compt) { - TRACE_LEAVE(); return; } + + TRACE_ENTER2("'%s'", compt->name.value); /* Free saAmfCtDefCmdEnv[i] before freeing saAmfCtDefCmdEnv */ if (compt->saAmfCtDefCmdEnv != NULL) { @@ -1142,7 +1140,7 @@ { int rc = -1; const SaImmAttrValuesT_2 **attributes; - SaImmAccessorHandleT accessorHandle; + SaImmAccessorHandleT accessorHandle = 0; SaImmAttrNameT attributeNames[2] = {attrName, NULL}; const char *s; SaAisErrorT error; @@ -1364,7 +1362,7 @@ unsigned int env_cntr = 0; const char *str; SaStringT env; - SaImmHandleT immOmHandle; + SaImmHandleT immOmHandle = 0; SaVersionT immVersion = { 'A', 2, 1 }; TRACE_ENTER2("%s", comp->name.value); @@ -1695,7 +1693,7 @@ const SaImmAttrValuesT_2 **attributes; const char *className = "SaAmfComp"; AVND_COMP *comp; - SaImmHandleT immOmHandle; + SaImmHandleT immOmHandle = 0; SaVersionT immVersion = { 'A', 2, 11 }; TRACE_ENTER2("SU'%s'", su->name.value); @@ -1746,9 +1744,9 @@ int avnd_comp_config_reinit(AVND_COMP *comp) { int res = -1; - SaImmAccessorHandleT accessorHandle; + SaImmAccessorHandleT accessorHandle = 0; const SaImmAttrValuesT_2 **attributes; - SaImmHandleT immOmHandle; + SaImmHandleT immOmHandle = 0; SaVersionT immVersion = { 'A', 2, 1 }; TRACE_ENTER2("'%s'", comp->name.value); ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel