From d79e7de19f39280f5f1f42cb3040578a98c9ffcd Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 26 Mar 2022 19:14:10 +0800 Subject: [PATCH] [TD-13758]: allow double free. --- include/os/osTimezone.h | 2 +- source/os/src/osEnv.c | 2 +- source/os/src/osMemory.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/os/osTimezone.h b/include/os/osTimezone.h index c259587264..3676c4b634 100644 --- a/include/os/osTimezone.h +++ b/include/os/osTimezone.h @@ -40,7 +40,7 @@ enum TdTimezone TdWestZone3, TdWestZone2, TdWestZone1, - TdZeroZero, + TdZeroZone, TdEastZone1, TdEastZone2, TdEastZone3, diff --git a/source/os/src/osEnv.c b/source/os/src/osEnv.c index 4847bbf2fe..22884298ef 100644 --- a/source/os/src/osEnv.c +++ b/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; diff --git a/source/os/src/osMemory.c b/source/os/src/osMemory.c index 1adf9f9bf3..2ce851cd63 100644 --- a/source/os/src/osMemory.c +++ b/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); -- GitLab