diff --git a/src/common/interfaces/libpq/client_logic_hooks/cmk_entity_manager_hooks/register_local_kms.cpp b/src/common/interfaces/libpq/client_logic_hooks/cmk_entity_manager_hooks/register_local_kms.cpp
index 739361e4a..2af6a9dbf 100644
--- a/src/common/interfaces/libpq/client_logic_hooks/cmk_entity_manager_hooks/register_local_kms.cpp
+++ b/src/common/interfaces/libpq/client_logic_hooks/cmk_entity_manager_hooks/register_local_kms.cpp
@@ -600,6 +600,7 @@ static CmkemErrCode read_and_decrypt_cmk(const char *key_path, AsymmetricKeyType
 
     ret = read_cmk_plain(key_file_path, ret_key_plain->ustr_val, &ret_key_plain->ustr_len);
     if (ret != CMKEM_SUCCEED) {
+        free_cmkem_ustr_with_erase(ret_key_plain);
         return ret;
     }
 
@@ -758,11 +759,13 @@ static CmkemErrCode encrypt_cek_with_rsa(CmkemUStr *cek_plain, const char *cmk_i
 
     ret_cek_cipher = malloc_cmkem_ustr(MAX_ASYMM_KEY_BUF_LEN);
     if (ret_cek_cipher == NULL) {
+        RSA_free(rsa_cmk_plain);
         return CMKEM_MALLOC_MEM_ERR;
     }
 
     enc_ret = RSA_public_encrypt(cek_plain->ustr_len, cek_plain->ustr_val, ret_cek_cipher->ustr_val, rsa_cmk_plain,
         RSA_PKCS1_OAEP_PADDING);
+    RSA_free(rsa_cmk_plain);
     if (enc_ret == -1) {
         free_cmkem_ustr(ret_cek_cipher);
         return CMKEM_RSA_ENCRYPT_ERR;
diff --git a/src/gausskernel/optimizer/commands/trigger.cpp b/src/gausskernel/optimizer/commands/trigger.cpp
index c170a0e49..bd8e25d20 100644
--- a/src/gausskernel/optimizer/commands/trigger.cpp
+++ b/src/gausskernel/optimizer/commands/trigger.cpp
@@ -694,16 +694,14 @@ Oid CreateTrigger(CreateTrigStmt* stmt, const char* queryString, Oid relOid, Oid
                             needTestName,RelationGetRelationName(rel))));
                 }
             }
+        } else {
+            values[Anum_pg_trigger_tgordername - 1] = DirectFunctionCall1(namein, CStringGetDatum(""));
+            values[Anum_pg_trigger_tgorder - 1] = DirectFunctionCall1(namein, CStringGetDatum(""));
         }
-        else {
-            values[Anum_pg_trigger_tgordername - 1] = NameGetDatum(&(""));
-            values[Anum_pg_trigger_tgorder - 1] = NameGetDatum(&(""));
-        }
-    }
-    else {
-        values[Anum_pg_trigger_tgordername - 1] = NameGetDatum(&(""));
-        values[Anum_pg_trigger_tgorder - 1] = NameGetDatum(&(""));
-        values[Anum_pg_trigger_tgtime - 1] = NameGetDatum(&(""));
+    } else {
+        values[Anum_pg_trigger_tgordername - 1] = DirectFunctionCall1(namein, CStringGetDatum(""));
+        values[Anum_pg_trigger_tgorder - 1] = DirectFunctionCall1(namein, CStringGetDatum(""));
+        values[Anum_pg_trigger_tgtime - 1] = DirectFunctionCall1(namein, CStringGetDatum(""));
     }
     if (stmt->args) {
         ListCell* le = NULL;