diff --git a/source/util/src/tenv.c b/source/util/src/tenv.c
index 29ae7c411b..967b1282a9 100644
--- a/source/util/src/tenv.c
+++ b/source/util/src/tenv.c
@@ -14,8 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "tenv.h"
 #include "tconfig.h"
+#include "tenv.h"
 
 static char toLowChar(char c) { return (c > 'Z' || c < 'A' ? c : (c - 'A' + 'a')); }
 
@@ -50,12 +50,12 @@ int32_t taosEnvNameToCfgName(const char *envNameStr, char *cfgNameStr, int32_t c
   return strlen(cfgNameStr);
 }
 
-int32_t taosEnvToCfg(const char *envStr, char *cfgStr,int32_t cfgStrLen) {
+int32_t taosEnvToCfg(const char *envStr, char *cfgStr, int32_t cfgStrLen) {
   if (envStr == NULL || cfgStr == NULL) {
     return TSDB_CODE_INVALID_PARA;
   }
   if (cfgStr != envStr) {
-    tstrncpy(cfgStr, envStr, strlen(envStr) + 1);
+    tstrncpy(cfgStr, envStr, cfgStrLen);
   }
   char *p = strchr(cfgStr, '=');