diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c
index 40af7bb567b9c121889a181e04e56fb223951890..fde9084ae302360878aedbf664016f4da2a1a53d 100644
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -330,7 +330,7 @@ static SFunctionNode* createFunction(const char* pName, SNodeList* pParameterLis
   if (NULL == pFunc) {
     return NULL;
   }
-  strcpy(pFunc->functionName, pName);
+  snprintf(pFunc->functionName, sizeof(pFunc->functionName), "%s", pName);
   pFunc->pParameterList = pParameterList;
   if (TSDB_CODE_SUCCESS != getFuncInfo(pFunc)) {
     pFunc->pParameterList = NULL;
@@ -408,10 +408,6 @@ static int32_t createMergeFunction(const SFunctionNode* pSrcFunc, const SFunctio
   if (TSDB_CODE_SUCCESS == code) {
     *pMergeFunc = pFunc;
   } else {
-    if (NULL != pFunc) {
-      pFunc->pParameterList = NULL;
-      nodesDestroyNode((SNode*)pFunc);
-    }
     nodesDestroyList(pParameterList);
   }
 
diff --git a/source/libs/function/src/tpercentile.c b/source/libs/function/src/tpercentile.c
index 62c5e4b28b9b755b68402ef90405290f3c6d40d1..6a1427c63f9d69425cf11308f696349e4f48da4d 100644
--- a/source/libs/function/src/tpercentile.c
+++ b/source/libs/function/src/tpercentile.c
@@ -96,16 +96,19 @@ double findOnlyResult(tMemBucket *pMemBucket) {
     }
 
     int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times);
-    SArray *list = *(SArray **)taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
-    assert(list->size == 1);
+    SArray **pList = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+    if (pList != NULL)  {
+      SArray *list = *pList;
+      assert(list->size == 1);
 
-    int32_t   *pageId = taosArrayGet(list, 0);
-    SFilePage *pPage = getBufPage(pMemBucket->pBuffer, *pageId);
-    assert(pPage->num == 1);
+      int32_t   *pageId = taosArrayGet(list, 0);
+      SFilePage *pPage = getBufPage(pMemBucket->pBuffer, *pageId);
+      assert(pPage->num == 1);
 
-    double v = 0;
-    GET_TYPED_DATA(v, double, pMemBucket->type, pPage->data);
-    return v;
+      double v = 0;
+      GET_TYPED_DATA(v, double, pMemBucket->type, pPage->data);
+      return v;
+    }
   }
 
   return 0;