Hi Dat,
ACK from me with no comment.
Best Regards,
Thien
-----Original Message-----
From: Dat Tran Quoc Phan <dat.tq.p...@dektech.com.au>
Sent: Friday, April 14, 2023 7:01 AM
To: Thang Duc Nguyen <thang.d.ngu...@dektech.com.au>; Thien Minh Huynh
<thien.m.hu...@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net; Dat Tran Quoc Phan
<dat.tq.p...@dektech.com.au>
Subject: [PATCH 1/1] rde: fix errors reported by Valgrind [#3333]
Fix memleak detected by Valgrind when receive rde message.
Also fix the uninitialized value(s).
---
src/rde/rded/rde_amf.cc | 1 +
src/rde/rded/rde_mds.cc | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/rde/rded/rde_amf.cc b/src/rde/rded/rde_amf.cc index
5a80bc418..9ae8bbce2 100644
--- a/src/rde/rded/rde_amf.cc
+++ b/src/rde/rded/rde_amf.cc
@@ -151,6 +151,7 @@ uint32_t rde_amf_init(RDE_AMF_CB *rde_amf_cb) {
NCSCC_RC_SUCCESS)
return NCSCC_RC_FAILURE;
+ memset(&amfCallbacks, 0, sizeof(amfCallbacks));
amfCallbacks.saAmfHealthcheckCallback = rde_saf_health_chk_callback;
amfCallbacks.saAmfCSISetCallback = rde_saf_CSI_set_callback;
amfCallbacks.saAmfCSIRemoveCallback = rde_saf_CSI_rem_callback; diff --git
a/src/rde/rded/rde_mds.cc b/src/rde/rded/rde_mds.cc index 4591d1996..42db8583a
100644
--- a/src/rde/rded/rde_mds.cc
+++ b/src/rde/rded/rde_mds.cc
@@ -48,10 +48,12 @@ static uint32_t msg_encode(MDS_CALLBACK_ENC_INFO *enc_info)
{
assert(data);
ncs_encode_32bit(&data, msg->info.peer_info.ha_role);
ncs_enc_claim_space(uba, sizeof(uint32_t));
- data = ncs_enc_reserve_space(uba, sizeof(uint64_t));
- assert(data);
- ncs_encode_64bit(&data, msg->info.peer_info.promote_pending);
- ncs_enc_claim_space(uba, sizeof(uint64_t));
+ if (msg->info.peer_info.ha_role == PCS_RDA_UNDEFINED) {
+ data = ncs_enc_reserve_space(uba, sizeof(uint64_t));
+ assert(data);
+ ncs_encode_64bit(&data, msg->info.peer_info.promote_pending);
+ ncs_enc_claim_space(uba, sizeof(uint64_t));
+ }
break;
default:
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
