Merge pull request #11027 from taosdata/fix/ZhiqiangWang/TD-13758-allow-double-free

[TD-13758]<fix>: allow double free.

include/os/osTimezone.h

@@ -40,7 +40,7 @@ enum TdTimezone
       TdWestZone3,
       TdWestZone2,
       TdWestZone1,
-      TdZeroZero,
+      TdZeroZone,
       TdEastZone1,
       TdEastZone2,
       TdEastZone3,

source/os/src/osEnv.c

@@ -27,7 +27,7 @@ SDiskSpace      tsLogSpace = {0};
 SDiskSpace      tsTempSpace = {0};
 char            tsOsName[16] = {0};
 char            tsTimezoneStr[TD_TIMEZONE_LEN] = {0};
-enum TdTimezone tsTimezone = TdZeroZero;
+enum TdTimezone tsTimezone = TdZeroZone;
 char            tsLocale[TD_LOCALE_LEN] = {0};
 char            tsCharset[TD_CHARSET_LEN] = {0};
 int8_t          tsDaylight = 0;

source/os/src/osMemory.c

@@ -115,7 +115,8 @@ void taosMemoryFree(const void *ptr) {
 
   TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char*)ptr - sizeof(TdMemoryInfo));
   if(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) {
-    memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
+    pTdMemoryInfo->memorySize = 0;
+    // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
     free(pTdMemoryInfo);
   } else {
     free((void*)ptr);