diff --git a/src/bin/psql/mainloop.cpp b/src/bin/psql/mainloop.cpp
index 207d9e9a5a09051450a4a5324a9ad137725f2e7b..4420f16651adc6a7b2a9c20b5261c042dfd449d6 100644
--- a/src/bin/psql/mainloop.cpp
+++ b/src/bin/psql/mainloop.cpp
@@ -119,6 +119,8 @@ static void JudgeEndStateInBFormat(const char* inputLine, bool &is_b_format, cha
     if (reset_check_after_reconn) {
         is_just_one_check = false;
         is_just_two_check = false;
+        free(inputLine_temp);
+        inputLine_temp =NULL;
         return;
     }
     
diff --git a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
index 583bafbd7882fb3b313c767ef2ca17081104e17b..e2e47fd761cf59bd53c442b9fba820bc0d6ed7e0 100644
--- a/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
+++ b/src/gausskernel/ddes/adapter/ss_dms_callback.cpp
@@ -1231,10 +1231,15 @@ static void CBDMSMemFree(void *pointer)
 static void *CBDrcMemAlloc(size_t size)
 {
     void *ptr = NULL;
-    ptr = palloc_huge(DMSDrcContext, size);
+    if (AllocSizeIsValid(size)) {
+        ptr = MemoryContextAlloc(DMSDrcContext, size);
+    } else {
+        ptr = palloc_huge(DMSDrcContext, size);
+    }
     if (ptr == NULL) {
-        ereport(FATAL, (errmsg("Failed to allocate memory for DMSDrcContext.")));
+        ereport(FATAL, (errmsg("Failed to allocate memory for DMSMemContext.")));
     }
+
     return ptr;
 }
 
@@ -2603,8 +2608,8 @@ void DmsInitCallback(dms_callback_t *callback)
     callback->mem_free = CBMemFree;
     callback->mem_reset = CBMemReset;
 
-    callback->dms_malloc_prot = CBDMSMemAlloc;
-    callback->dms_free_prot = CBDMSMemFree;
+    callback->dms_malloc_prot = CBDrcMemAlloc;
+    callback->dms_free_prot = CBDrcMemFree;
 
     callback->drc_malloc_prot = CBDrcMemAlloc;
     callback->drc_free_prot = CBDrcMemFree;
diff --git a/src/gausskernel/ddes/ddes_commit_id b/src/gausskernel/ddes/ddes_commit_id
index eefab2c446b6d344232cda4de5118b488e0d7006..e1e2b3f804827c2e127249c6d493fb9003e0795e 100644
--- a/src/gausskernel/ddes/ddes_commit_id
+++ b/src/gausskernel/ddes/ddes_commit_id
@@ -1,3 +1,3 @@
-dms_commit_id=39e6fc1ace37fa0ea96bf1410222e1d7be6abdb9
+dms_commit_id=a83ad9aae9ca0ca01942d9100b174b9c1c516f94
 dss_commit_id=f88751898d4e1d098c29ee34b8933fd4ed23ba90
 cbb_commit_id=0a9fe182799f7cff7a4943b3c09c87a05326de0c
\ No newline at end of file