From f1ce91f600e1c93c752e7dfa36a16effa5ad9cc4 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 6 Jul 2023 16:49:59 +0800 Subject: [PATCH 1/2] fix:race condition for pTq->pStore->pHash --- source/dnode/vnode/src/tq/tqOffset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tq/tqOffset.c b/source/dnode/vnode/src/tq/tqOffset.c index 0a9905b544..11bb737225 100644 --- a/source/dnode/vnode/src/tq/tqOffset.c +++ b/source/dnode/vnode/src/tq/tqOffset.c @@ -104,7 +104,7 @@ STqOffsetStore* tqOffsetOpen(STQ* pTq) { pStore->needCommit = 0; pTq->pOffsetStore = pStore; - pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_NO_LOCK); + pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK); if (pStore->pHash == NULL) { taosMemoryFree(pStore); return NULL; From ba9ab1f20b9740c7240b15fb9a21a7cfceb3fbc8 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 6 Jul 2023 17:02:58 +0800 Subject: [PATCH 2/2] fix:null pointer error --- source/client/src/clientTmq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c index e1b2b9c48b..1d56ea463b 100644 --- a/source/client/src/clientTmq.c +++ b/source/client/src/clientTmq.c @@ -2488,6 +2488,9 @@ static int32_t tmqGetWalInfoCb(void* param, SDataBuf* pMsg, int32_t code) { } static void destroyCommonInfo(SMqVgCommon* pCommon) { + if(pCommon == NULL){ + return; + } taosArrayDestroy(pCommon->pList); tsem_destroy(&pCommon->rsp); taosThreadMutexDestroy(&pCommon->mutex);