From c428c9395e94f7784a20ad10e5f172094a38e6b1 Mon Sep 17 00:00:00 2001 From: Shengliang Date: Fri, 25 Mar 2022 14:52:24 +0800 Subject: [PATCH 1/2] handle except --- source/libs/transport/src/transCli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 3b8ea5858f..3a24d08a58 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -159,7 +159,7 @@ static void destroyThrdObj(SCliThrdObj* pThrd); int i = 0, sz = transQueueSize(&conn->cliMsgs); \ for (; i < sz; i++) { \ pMsg = transQueueGet(&conn->cliMsgs, i); \ - if (pMsg != NULL && (uint64_t)pMsg->ctx->ahandle == ahandle) { \ + if (pMsg != NULL && pMsg->ctx != NULL && (uint64_t)pMsg->ctx->ahandle == ahandle) { \ break; \ } \ } \ From 9addf717c9da4473a350862896b60ce6350fef49 Mon Sep 17 00:00:00 2001 From: Shengliang Date: Fri, 25 Mar 2022 14:55:58 +0800 Subject: [PATCH 2/2] handle except --- source/libs/transport/src/transSrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transSrv.c b/source/libs/transport/src/transSrv.c index 787c538f2a..3950a42ef0 100644 --- a/source/libs/transport/src/transSrv.c +++ b/source/libs/transport/src/transSrv.c @@ -292,7 +292,7 @@ void uvOnSendCb(uv_write_t* req, int status) { } transQueuePop(&conn->srvMsgs); tfree(msg); - msg = (SSrvMsg*)transQueuePop(&conn->srvMsgs); + msg = (SSrvMsg*)transQueueGet(&conn->srvMsgs, 0); if (msg != NULL) { uvStartSendRespInternal(msg); }