Always pfree tmp WAL key when allocated

dAdAbird · dAdAbird · commit cc459df8962e · 2025-04-16T18:17:41.000+03:00
We didn't pfree the key in case of `EncryptXLog == true &amp;&amp; key == true`
diff --git a/contrib/pg_tde/src/access/pg_tde_xlog_encrypt.c b/contrib/pg_tde/src/access/pg_tde_xlog_encrypt.c
@@ -206,15 +206,16 @@ TDEXLogSmgrInit(void)
 	{
 		pg_tde_create_wal_key(&EncryptionKey, &GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID),
 							  TDE_KEY_TYPE_WAL_UNENCRYPTED);
-		pfree(key);
 	}
 	else if (key)
 	{
 		EncryptionKey = *key;
 		pg_atomic_write_u64(&EncryptionState->enc_key_lsn, EncryptionKey.start_lsn);
-		pfree(key);
 	}
 
+	if (key)
+		pfree(key);
+
 	pg_tde_set_db_file_path(GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID).dbOid, EncryptionState->db_map_path);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -206,15 +206,16 @@ TDEXLogSmgrInit(void)`
`206`	`206`	`{`
`207`	`207`	`pg_tde_create_wal_key(&EncryptionKey, &GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID),`
`208`	`208`	`TDE_KEY_TYPE_WAL_UNENCRYPTED);`
`209`		`- pfree(key);`
`210`	`209`	`}`
`211`	`210`	`else if (key)`
`212`	`211`	`{`
`213`	`212`	`EncryptionKey = *key;`
`214`	`213`	`pg_atomic_write_u64(&EncryptionState->enc_key_lsn, EncryptionKey.start_lsn);`
`215`		`- pfree(key);`
`216`	`214`	`}`
`217`	`215`
	`216`	`+ if (key)`
	`217`	`+ pfree(key);`
	`218`	`+`
`218`	`219`	`pg_tde_set_db_file_path(GLOBAL_SPACE_RLOCATOR(XLOG_TDE_OID).dbOid, EncryptionState->db_map_path);`
`219`	`220`
`220`	`221`	`#endif`