From cea6df10a9e8225cbeae81cbb6310dc1f9e18122 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 17 Dec 2020 16:38:30 +0800
Subject: [PATCH] TD-2428

---
 src/sync/src/syncMain.c    | 5 +++--
 src/sync/src/syncMsg.c     | 3 ---
 src/sync/src/syncRestore.c | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index d0dc291257..ac79b48606 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -949,9 +949,10 @@ static int32_t syncProcessPeerMsg(void *param, void *buffer) {
 static void syncSendPeersStatusMsgToPeer(SSyncPeer *pPeer, char ack, int8_t type, uint16_t tranId) {
   if (pPeer->peerFd < 0 || pPeer->ip == 0) return;
 
-  SSyncNode *pNode = pPeer->pSyncNode;
-  SPeersStatus msg = {0};
+  SSyncNode *  pNode = pPeer->pSyncNode;
+  SPeersStatus msg;
 
+  memset(&msg, 0, sizeof(SPeersStatus));
   syncBuildPeersStatus(&msg, pNode->vgId);
 
   msg.role = nodeRole;
diff --git a/src/sync/src/syncMsg.c b/src/sync/src/syncMsg.c
index 6e1dea854b..034f9a98a7 100644
--- a/src/sync/src/syncMsg.c
+++ b/src/sync/src/syncMsg.c
@@ -88,7 +88,6 @@ void syncBuildSyncDataMsg(SSyncMsg *pMsg, int32_t vgId) { syncBuildMsg(pMsg, vgI
 void syncBuildSyncSetupMsg(SSyncMsg *pMsg, int32_t vgId) { syncBuildMsg(pMsg, vgId, TAOS_SMSG_SETUP); }
 
 void syncBuildPeersStatus(SPeersStatus *pMsg, int32_t vgId) {
-  memset(pMsg, 0, sizeof(SPeersStatus));
   pMsg->head.type = TAOS_SMSG_STATUS;
   pMsg->head.vgId = vgId;
   pMsg->head.len = sizeof(SPeersStatus) - sizeof(SSyncHead);
@@ -96,7 +95,6 @@ void syncBuildPeersStatus(SPeersStatus *pMsg, int32_t vgId) {
 }
 
 void syncBuildFileAck(SFileAck *pMsg, int32_t vgId) {
-  memset(pMsg, 0, sizeof(SFileAck));
   pMsg->head.type = TAOS_SMSG_SYNC_FILE_RSP;
   pMsg->head.vgId = vgId;
   pMsg->head.len = sizeof(SFileAck) - sizeof(SSyncHead);
@@ -104,7 +102,6 @@ void syncBuildFileAck(SFileAck *pMsg, int32_t vgId) {
 }
 
 void syncBuildFileInfo(SFileInfo *pMsg, int32_t vgId) {
-  memset(pMsg, 0, sizeof(SFileInfo));
   pMsg->head.type = TAOS_SMSG_SYNC_FILE;
   pMsg->head.vgId = vgId;
   pMsg->head.len = sizeof(SFileInfo) - sizeof(SSyncHead);
diff --git a/src/sync/src/syncRestore.c b/src/sync/src/syncRestore.c
index 088215ecc7..27570ce8f2 100644
--- a/src/sync/src/syncRestore.c
+++ b/src/sync/src/syncRestore.c
@@ -100,6 +100,7 @@ static int32_t syncRestoreFile(SSyncPeer *pPeer, uint64_t *fversion) {
                                         &sinfo.fversion);
 
     // if file not there or magic is not the same, file shall be synced
+    memset(&fileAck, 0, sizeof(SFileAck));
     syncBuildFileAck(&fileAck, pNode->vgId);
     fileAck.sync = (sinfo.magic != minfo.magic || sinfo.name[0] == 0) ? 1 : 0;
 
-- 
GitLab