From b10f8e4aa2c72e66d6d82a23db1e101ee254960e Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Fri, 27 May 2022 21:32:28 +0800
Subject: [PATCH] fix(sync) raftCfgPersist

---
 source/libs/sync/inc/syncRaftCfg.h |  2 ++
 source/libs/sync/src/syncRaftCfg.c | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/source/libs/sync/inc/syncRaftCfg.h b/source/libs/sync/inc/syncRaftCfg.h
index f4c857bb06..1061e8bdc4 100644
--- a/source/libs/sync/inc/syncRaftCfg.h
+++ b/source/libs/sync/inc/syncRaftCfg.h
@@ -27,6 +27,8 @@ extern "C" {
 #include "syncInt.h"
 #include "taosdef.h"
 
+#define CONFIG_FILE_LEN 1024
+
 typedef struct SRaftCfg {
   SSyncCfg  cfg;
   TdFilePtr pFile;
diff --git a/source/libs/sync/src/syncRaftCfg.c b/source/libs/sync/src/syncRaftCfg.c
index daf7992d43..70481b853e 100644
--- a/source/libs/sync/src/syncRaftCfg.c
+++ b/source/libs/sync/src/syncRaftCfg.c
@@ -50,10 +50,18 @@ int32_t raftCfgPersist(SRaftCfg *pRaftCfg) {
 
   char *s = raftCfg2Str(pRaftCfg);
   taosLSeekFile(pRaftCfg->pFile, 0, SEEK_SET);
-  int64_t ret = taosWriteFile(pRaftCfg->pFile, s, strlen(s) + 1);
-  assert(ret == strlen(s) + 1);
-  taosMemoryFree(s);
 
+  char buf[CONFIG_FILE_LEN];
+  memset(buf, 0, sizeof(buf));
+  ASSERT(strlen(s) + 1 <= CONFIG_FILE_LEN);
+  snprintf(buf, sizeof(buf), "%s", s);
+  int64_t ret = taosWriteFile(pRaftCfg->pFile, buf, sizeof(buf));
+  assert(ret == sizeof(buf));
+
+  //int64_t ret = taosWriteFile(pRaftCfg->pFile, s, strlen(s) + 1);
+  //assert(ret == strlen(s) + 1);
+
+  taosMemoryFree(s);
   taosFsyncFile(pRaftCfg->pFile);
   return 0;
 }
@@ -163,8 +171,16 @@ int32_t raftCfgCreateFile(SSyncCfg *pCfg, int8_t isStandBy, const char *path) {
   raftCfg.cfg = *pCfg;
   raftCfg.isStandBy = isStandBy;
   char *  s = raftCfg2Str(&raftCfg);
-  int64_t ret = taosWriteFile(pFile, s, strlen(s) + 1);
-  assert(ret == strlen(s) + 1);
+
+  char buf[CONFIG_FILE_LEN];
+  memset(buf, 0, sizeof(buf));
+  ASSERT(strlen(s) + 1 <= CONFIG_FILE_LEN);
+  snprintf(buf, sizeof(buf), "%s", s);
+  int64_t ret = taosWriteFile(pFile, buf, sizeof(buf));
+  assert(ret == sizeof(buf));
+
+  //int64_t ret = taosWriteFile(pFile, s, strlen(s) + 1);
+  //assert(ret == strlen(s) + 1);
 
   taosMemoryFree(s);
   taosCloseFile(&pFile);
-- 
GitLab