diff --git a/source/common/src/tmisce.c b/source/common/src/tmisce.c
index f1713cfd98..dfaebc99f6 100644
--- a/source/common/src/tmisce.c
+++ b/source/common/src/tmisce.c
@@ -21,7 +21,8 @@
 
 int32_t taosGetFqdnPortFromEp(const char* ep, SEp* pEp) {
   pEp->port = 0;
-  strcpy(pEp->fqdn, ep);
+  memset(pEp->fqdn, 0, TSDB_FQDN_LEN);
+  strncpy(pEp->fqdn, ep, TSDB_FQDN_LEN - 1);
 
   char* temp = strchr(pEp->fqdn, ':');
   if (temp) {
diff --git a/source/common/src/tname.c b/source/common/src/tname.c
index 887c449c56..70682d6cd4 100644
--- a/source/common/src/tname.c
+++ b/source/common/src/tname.c
@@ -90,8 +90,10 @@ int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t slidingTime, in
 SName* toName(int32_t acctId, const char* pDbName, const char* pTableName, SName* pName) {
   pName->type = TSDB_TABLE_NAME_T;
   pName->acctId = acctId;
-  strcpy(pName->dbname, pDbName);
-  strcpy(pName->tname, pTableName);
+  memset(pName->dbname, 0, TSDB_DB_NAME_LEN);
+  strncpy(pName->dbname, pDbName, TSDB_DB_NAME_LEN - 1);
+  memset(pName->tname, 0, TSDB_TABLE_NAME_LEN);
+  strncpy(pName->tname, pTableName, TSDB_TABLE_NAME_LEN - 1);
   return pName;
 }