database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2308 修复create trigger和ktool中的内存泄漏问题

Browse Source 
Merge pull request !2308 from pengjiong/fix_col
This commit is contained in:
opengauss-bot
2022-10-18 01:57:54 +00:00
committed by Gitee
parent 4bceef2a7e 486def8a48
commit 62bbcac3a0
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/interfaces/libpq/client_logic_hooks/cmk_entity_manager_hooks/register_local_kms.cpp
View File

@ -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;

16
src/gausskernel/optimizer/commands/trigger.cpp
View File

@ -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;