From 2b413844d32fa4f51b6e4a2716a8f539d56f3c54 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 1 Aug 2020 13:50:42 +0800
Subject: [PATCH] [td-225]

---
 src/util/src/hash.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index be4baf85d2..698bcbb15f 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -298,11 +298,13 @@ void *taosHashGetCB(SHashObj *pHashObj, const void *key, size_t keyLen, void (*f
   }
 
   SHashNode *pNode = doSearchInEntryList(pe, key, keyLen, hashVal);
-  if (fp != NULL) {
-    fp(pNode->data);
+  if (pNode != NULL) {
+    if (fp != NULL) {
+      fp(pNode->data);
+    }
+    data = pNode->data;
   }
 
-  data = pNode->data;
   if (pHashObj->type == HASH_ENTRY_LOCK) {
     taosRUnLockLatch(&pe->latch);
   }