提交 ce27353c 编写于 作者: D dapan1121

fix bug

上级 7daaecba
...@@ -101,7 +101,10 @@ void tdminit(); ...@@ -101,7 +101,10 @@ void tdminit();
#define TDMALLOC(s) tdmalloc(__FILE__, __LINE__, s,0) #define TDMALLOC(s) tdmalloc(__FILE__, __LINE__, s,0)
#define TDMCALLOC(s) tdmalloc(__FILE__, __LINE__, s,1) #define TDMCALLOC(s) tdmalloc(__FILE__, __LINE__, s,1)
#define TDMREALLOC(p,s) tdmrealloc(p,s) #define TDMREALLOC(p,s) tdmrealloc(p,s)
#define TDMFREE(p) tdmfree((void *)p) #define TDMFREE(p) do { if(p) \
{tdmfree((void *)p); \
p = 0; } \
} while (0)
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -624,7 +624,7 @@ void tdmfree(void *p){ ...@@ -624,7 +624,7 @@ void tdmfree(void *p){
memset((void *)((long)p-24), 0, 24); memset((void *)((long)p-24), 0, 24);
free(fp); free(fp);
fp=0; fp=0;
}else{ }else if(p){
//printf("direct free %p\n", p); //printf("direct free %p\n", p);
atomic_add_fetch_64(&tdm_stat.normalfn, 1); atomic_add_fetch_64(&tdm_stat.normalfn, 1);
free(p); free(p);
......
...@@ -6820,7 +6820,7 @@ static void freeColumnFilterInfo(SColumnFilterInfo* pFilter, int32_t numOfFilter ...@@ -6820,7 +6820,7 @@ static void freeColumnFilterInfo(SColumnFilterInfo* pFilter, int32_t numOfFilter
for (int32_t i = 0; i < numOfFilters; i++) { for (int32_t i = 0; i < numOfFilters; i++) {
if (pFilter[i].filterstr) { if (pFilter[i].filterstr) {
TDMFREE((void*)(pFilter[i].pz)); TDMFREE(pFilter[i].pz);
} }
} }
...@@ -7717,4 +7717,4 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) { ...@@ -7717,4 +7717,4 @@ void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) {
taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle); taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle);
return 0; return 0;
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册