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

fix: free before read issue

This commit is contained in:
dapan1121 2024-11-25 15:53:56 +08:00
parent 8455949575
commit 44d16f78fe
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/util/src/mpDirect.c
View File

@ -41,9 +41,8 @@ void* mpDirectCalloc(SMemPool* pPool, SMPJob* pJob, int64_t num, int64_t size) {
} }
void mpDirectFree(SMemPool* pPool, SMPJob* pJob, void *ptr) { void mpDirectFree(SMemPool* pPool, SMPJob* pJob, void *ptr) {
taosMemFree(ptr);
(void)atomic_sub_fetch_64(&pJob->job.allocMemSize, taosMemSize(ptr)); (void)atomic_sub_fetch_64(&pJob->job.allocMemSize, taosMemSize(ptr));
taosMemFree(ptr);
} }

2
source/util/src/tmempool.c
View File

@ -1730,7 +1730,7 @@ int32_t taosMemoryPoolInit(mpReserveFailFp failFp, mpReserveReachFp reachFp) {
void taosAutoMemoryFree(void *ptr) { void taosAutoMemoryFree(void *ptr) {
if (NULL != gMemPoolHandle) { if (NULL != gMemPoolHandle && threadPoolEnabled && threadPoolSession) {
taosMemPoolFree(gMemPoolHandle, threadPoolSession, ptr, __FILE__, __LINE__); taosMemPoolFree(gMemPoolHandle, threadPoolSession, ptr, __FILE__, __LINE__);
} else { } else {
taosMemFree(ptr); taosMemFree(ptr);