From f8d8beadebbe44b186126ef35112bc40c3e578cc Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 21 May 2022 16:54:56 +0800
Subject: [PATCH 1/3] refactor: add assert in hash table.

---
 source/util/src/thash.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/util/src/thash.c b/source/util/src/thash.c
index 4bbf6ccf45..8ae0a33f0f 100644
--- a/source/util/src/thash.c
+++ b/source/util/src/thash.c
@@ -192,12 +192,15 @@ static FORCE_INLINE void doUpdateHashNode(SHashObj *pHashObj, SHashEntry* pe, SH
   atomic_sub_fetch_16(&pNode->refCount, 1);
   if (prev != NULL) {
     prev->next = pNewNode;
+    ASSERT(prev->next != prev);
   } else {
     pe->next = pNewNode;
   }
 
   if (pNode->refCount <= 0) {
     pNewNode->next = pNode->next;
+    ASSERT(pNewNode->next != pNewNode);
+
     FREE_HASH_NODE(pHashObj->freeFp, pNode);
   } else {
     pNewNode->next = pNode;
@@ -525,6 +528,7 @@ int32_t taosHashRemove(SHashObj *pHashObj, const void *key, size_t keyLen) {
           pe->next = pNode->next;
         } else {
           prevNode->next = pNode->next;
+          ASSERT(prevNode->next != prevNode);
         }
 
         pe->num--;
@@ -719,6 +723,7 @@ void pushfrontNodeInEntryList(SHashEntry *pEntry, SHashNode *pNode) {
   pNode->next = pEntry->next;
   pEntry->next = pNode;
 
+  ASSERT(pNode->next != pNode);
   pEntry->num += 1;
 }
 

From ff615a066c41cf2ed2990048fc044181710cf166 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 21 May 2022 16:56:27 +0800
Subject: [PATCH 2/3] refactor: add assert in hash.

---
 source/util/src/thash.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/util/src/thash.c b/source/util/src/thash.c
index 8ae0a33f0f..89fc446da9 100644
--- a/source/util/src/thash.c
+++ b/source/util/src/thash.c
@@ -774,8 +774,11 @@ static void *taosHashReleaseNode(SHashObj *pHashObj, void *p, int *slot) {
     if (pOld->refCount <=0) {
       if (prevNode) {
         prevNode->next = pOld->next;
+        ASSERT(prevNode->next != prevNode);
       } else {
         pe->next = pOld->next;
+        SHashNode* x = pe->next;
+        ASSERT(x->next != x);
       }
 
       pe->num--;

From 0f0060f8c3a3a5de1580011f5790171846755e5d Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 21 May 2022 17:04:13 +0800
Subject: [PATCH 3/3] fix: add a null ptr check.

---
 source/util/src/thash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/util/src/thash.c b/source/util/src/thash.c
index 89fc446da9..18404f8bde 100644
--- a/source/util/src/thash.c
+++ b/source/util/src/thash.c
@@ -778,7 +778,9 @@ static void *taosHashReleaseNode(SHashObj *pHashObj, void *p, int *slot) {
       } else {
         pe->next = pOld->next;
         SHashNode* x = pe->next;
-        ASSERT(x->next != x);
+        if (x != NULL) {
+          ASSERT(x->next != x);
+        }
       }
 
       pe->num--;