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

fix invalid read

This commit is contained in:
yihaoDeng 2024-09-19 11:16:32 +08:00
parent a5306b7133
commit 14df30671b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/libs/transport/src/transCli.c
View File

@ -280,6 +280,8 @@ static void cliWalkCb(uv_handle_t* handle, void* arg);
static void cliWalkCb(uv_handle_t* handle, void* arg); static void cliWalkCb(uv_handle_t* handle, void* arg);
static FORCE_INLINE int32_t destroyAllReqs(SCliConn* SCliConn);
static FORCE_INLINE bool filterAllReq(void* e, void* arg);
typedef struct { typedef struct {
void* p; void* p;
HeapNode node; HeapNode node;
@ -1032,6 +1034,8 @@ static void cliDestroy(uv_handle_t* handle) {
SCliThrd* pThrd = conn->hostThrd; SCliThrd* pThrd = conn->hostThrd;
cliResetConnTimer(conn); cliResetConnTimer(conn);
destroyAllReqs(conn);
if (conn->refId > 0) { if (conn->refId > 0) {
(void)transReleaseExHandle(transGetRefMgt(), conn->refId); (void)transReleaseExHandle(transGetRefMgt(), conn->refId);
(void)transRemoveExHandle(transGetRefMgt(), conn->refId); (void)transRemoveExHandle(transGetRefMgt(), conn->refId);
@ -1065,15 +1069,13 @@ static void cliDestroy(uv_handle_t* handle) {
taosMemoryFree(conn); taosMemoryFree(conn);
} }
bool filterAllReq(void* e, void* arg) { return 1; } static FORCE_INLINE bool filterAllReq(void* e, void* arg) { return 1; }
static void cliHandleException(SCliConn* conn) { static FORCE_INLINE int32_t destroyAllReqs(SCliConn* conn) {
int32_t code = 0; int32_t code = 0;
SCliThrd* pThrd = conn->hostThrd; SCliThrd* pThrd = conn->hostThrd;
STrans* pInst = pThrd->pInst; STrans* pInst = pThrd->pInst;
queue set;
cliResetConnTimer(conn);
queue set;
QUEUE_INIT(&set); QUEUE_INIT(&set);
// TODO // TODO
// 1. from qId from thread table // 1. from qId from thread table
@ -1113,6 +1115,15 @@ static void cliHandleException(SCliConn* conn) {
destroyReq(pReq); destroyReq(pReq);
} }
} }
return 0;
}
static void cliHandleException(SCliConn* conn) {
int32_t code = 0;
SCliThrd* pThrd = conn->hostThrd;
STrans* pInst = pThrd->pInst;
cliResetConnTimer(conn);
destroyAllReqs(conn);
QUEUE_REMOVE(&conn->q); QUEUE_REMOVE(&conn->q);
if (conn->registered) { if (conn->registered) {