xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
afwerar 2022-03-26 19:14:10 +08:00
parent b4571036b6
commit d79e7de19f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os/osTimezone.h
View File

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

2
source/os/src/osEnv.c
View File

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

3
source/os/src/osMemory.c
View File

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