From d2e780b14e778989dd54ab28c8b2381a998a6d92 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Tue, 19 Jul 2022 16:47:53 +0800 Subject: [PATCH] fix: fix memory leak --- source/libs/transport/src/trans.c | 2 +- source/libs/transport/src/transComm.c | 3 ++- tests/script/api/batchprepare.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c index 725f3b32cf..79f2f17a6e 100644 --- a/source/libs/transport/src/trans.c +++ b/source/libs/transport/src/trans.c @@ -112,7 +112,7 @@ void* rpcMallocCont(int32_t contLen) { void rpcFreeCont(void* cont) { if (cont == NULL) return; taosMemoryFree((char*)cont - TRANS_MSG_OVERHEAD); - tTrace("free mem:%p", (char*)cont - TRANS_MSG_OVERHEAD); + tTrace("rpc free cont:%p", (char*)cont - TRANS_MSG_OVERHEAD); } void* rpcReallocCont(void* ptr, int32_t contLen) { diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c index 84af8da513..0e1e4c6040 100644 --- a/source/libs/transport/src/transComm.c +++ b/source/libs/transport/src/transComm.c @@ -124,6 +124,7 @@ int transAllocBuffer(SConnBuffer* connBuf, uv_buf_t* uvBuf) { SConnBuffer* p = connBuf; if (p->cap == 0) { p->buf = (char*)taosMemoryCalloc(CAPACITY, sizeof(char)); + tTrace("internal malloc mem:%p, size:%d", p->buf, CAPACITY); p->len = 0; p->cap = CAPACITY; p->total = -1; @@ -136,7 +137,7 @@ int transAllocBuffer(SConnBuffer* connBuf, uv_buf_t* uvBuf) { } else { p->cap = p->total; p->buf = taosMemoryRealloc(p->buf, p->cap); - tTrace("internal malloc mem:%p, size:%d", p->buf, p->cap); + tTrace("internal realloc mem:%p, size:%d", p->buf, p->cap); uvBuf->base = p->buf + p->len; uvBuf->len = p->cap - p->len; diff --git a/tests/script/api/batchprepare.c b/tests/script/api/batchprepare.c index a330b6416e..e89a8b33eb 100644 --- a/tests/script/api/batchprepare.c +++ b/tests/script/api/batchprepare.c @@ -328,7 +328,7 @@ CaseCtrl gCaseCtrl = { // query case with specified col&oper //.optrIdxList = optrIdxList, //.bindColTypeNum = tListLen(bindColTypeList), //.bindColTypeList = bindColTypeList, - .caseIdx = 24, + .caseIdx = 8, .caseNum = 1, .caseRunNum = 1, }; @@ -1384,6 +1384,7 @@ void bpCheckTagFields(TAOS_STMT *stmt, TAOS_MULTI_BIND* pBind) { } bpCheckColTagFields(stmt, fieldNum, pFields, gCurCase->bindTagNum, pBind, BP_BIND_TAG); + taosMemoryFree(pFields); } void bpCheckColFields(TAOS_STMT *stmt, TAOS_MULTI_BIND* pBind) { @@ -1401,6 +1402,7 @@ void bpCheckColFields(TAOS_STMT *stmt, TAOS_MULTI_BIND* pBind) { } bpCheckColTagFields(stmt, fieldNum, pFields, gCurCase->bindColNum, pBind, BP_BIND_COL); + taosMemoryFree(pFields); } void bpShowBindParam(TAOS_MULTI_BIND *bind, int32_t num) {