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

Merge pull request #20268 from taosdata/fix/fixDoubleFree 

fix: avoid double free conn
This commit is contained in:
Shengliang Guan 2023-03-06 09:38:42 +08:00 committed by GitHub
parent a55087de58 ee65a49781
commit dbf8443686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -864,6 +864,8 @@ static void cliDestroyConn(SCliConn* conn, bool clear) {
QUEUE_REMOVE(&conn->q);
QUEUE_INIT(&conn->q);
conn->broken = true;
if (conn->list != NULL) {
SConnList* connList = conn->list;
connList->list->numOfConn--;
@ -1230,7 +1232,7 @@ static void cliSendBatchCb(uv_write_t* req, int status) {
} else {
tDebug("%s conn %p succ to send batch msg, batch size:%d, msgLen:%d", CONN_GET_INST_LABEL(conn), conn, p->wLen,
p->batchSize);
if (!uv_is_closing((uv_handle_t*)&conn->stream)) {
if (!uv_is_closing((uv_handle_t*)&conn->stream) && conn->broken == false) {
if (nxtBatch != NULL) {
conn->pBatch = nxtBatch;
cliSendBatch(conn);