From 4068e3d73bb84bdea59767fc067214d6d3335b55 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Tue, 6 Aug 2024 15:39:12 +0800
Subject: [PATCH 1/2] fix: memleak in initWktRegex

---
 source/libs/geometry/src/geosWrapper.c | 12 +++++++++++-
 source/util/src/tpcre2.c               | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/source/libs/geometry/src/geosWrapper.c b/source/libs/geometry/src/geosWrapper.c
index 6ca8a39bb5..dde34edc91 100644
--- a/source/libs/geometry/src/geosWrapper.c
+++ b/source/libs/geometry/src/geosWrapper.c
@@ -147,7 +147,17 @@ static int32_t initWktRegex(pcre2_code **ppRegex, pcre2_match_data **ppMatchData
       "*)(([-+]?[0-9]+\\.?[0-9]*)|([-+]?[0-9]*\\.?[0-9]+))(e[-+]?[0-9]+)?){1,3}( *))*( *)\\)))( *))*( *)\\)))( *))*( "
       "*)\\)))|(GEOCOLLECTION\\((?R)(( *)(,)( *)(?R))*( *)\\))( *)$");
 
-  code = doRegComp(ppRegex, ppMatchData, wktPatternWithSpace);
+  pcre2_code       *pRegex = NULL;
+  pcre2_match_data *pMatchData = NULL;
+  code = doRegComp(&pRegex, &pMatchData, wktPatternWithSpace);
+  if (code < 0) {
+    taosMemoryFree(wktPatternWithSpace);
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
+  *ppRegex = pRegex;
+  *ppMatchData = pMatchData;
+
   taosMemoryFree(wktPatternWithSpace);
   return code;
 }
diff --git a/source/util/src/tpcre2.c b/source/util/src/tpcre2.c
index 52991c58b8..ba9bd51510 100644
--- a/source/util/src/tpcre2.c
+++ b/source/util/src/tpcre2.c
@@ -5,14 +5,24 @@ int32_t doRegComp(pcre2_code** ppRegex, pcre2_match_data** ppMatchData, const ch
   int        errorcode;
   PCRE2_SIZE erroroffset;
 
-  *ppRegex = pcre2_compile((PCRE2_SPTR8)pattern, PCRE2_ZERO_TERMINATED, options, &errorcode, &erroroffset, NULL);
-  if (*ppRegex == NULL) {
+  pcre2_code*       pRegex = NULL;
+  pcre2_match_data* pMatchData = NULL;
+
+  pRegex = pcre2_compile((PCRE2_SPTR8)pattern, PCRE2_ZERO_TERMINATED, options, &errorcode, &erroroffset, NULL);
+  if (pRegex == NULL) {
     PCRE2_UCHAR buffer[256];
     (void)pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
-    return 1;
+    return -1;
   }
 
-  *ppMatchData = pcre2_match_data_create_from_pattern(*ppRegex, NULL);
+  pMatchData = pcre2_match_data_create_from_pattern(pRegex, NULL);
+  if (pMatchData == NULL) {
+    pcre2_code_free(pRegex);
+    return -1;
+  }
+
+  *ppRegex = pRegex;
+  *ppMatchData = pMatchData;
 
   return 0;
 }

From 6316c22f6f8d46464c974273e8221287ad8ed80b Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Tue, 6 Aug 2024 18:00:31 +0800
Subject: [PATCH 2/2] fix: type check for executeGeomFromTextFunc

---
 source/libs/geometry/src/geomFunc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/libs/geometry/src/geomFunc.c b/source/libs/geometry/src/geomFunc.c
index 194590c06c..4426427bf5 100644
--- a/source/libs/geometry/src/geomFunc.c
+++ b/source/libs/geometry/src/geomFunc.c
@@ -156,6 +156,10 @@ _exit:
 int32_t executeGeomFromTextFunc(SColumnInfoData *pInputData, int32_t i, SColumnInfoData *pOutputData) {
   int32_t code = TSDB_CODE_FAILED;
 
+  if (!IS_VAR_DATA_TYPE((pInputData)->info.type)) {
+    return TSDB_CODE_FUNC_FUNTION_PARA_VALUE;
+  }
+
   char          *input = colDataGetData(pInputData, i);
   unsigned char *output = NULL;