From aba7ce6508f4e3d4bc42ff04f18c789858a900dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20=C3=85strand?= Date: Tue, 6 May 2025 15:00:04 +0200 Subject: [PATCH] Don't crash on null input to kmip key provider Also use the same way to compare to the empty string as everything else around this. --- contrib/pg_tde/src/catalog/tde_keyring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/pg_tde/src/catalog/tde_keyring.c b/contrib/pg_tde/src/catalog/tde_keyring.c index d8c0bb0c897..0fefa6e9573 100644 --- a/contrib/pg_tde/src/catalog/tde_keyring.c +++ b/contrib/pg_tde/src/catalog/tde_keyring.c @@ -886,10 +886,10 @@ load_kmip_keyring_provider_options(char *keyring_options) ParseKeyringJSONOptions(KMIP_KEY_PROVIDER, (GenericKeyring *) kmip_keyring, keyring_options, strlen(keyring_options)); - if (strlen(kmip_keyring->kmip_host) == 0 || - strlen(kmip_keyring->kmip_port) == 0 || - strlen(kmip_keyring->kmip_ca_path) == 0 || - strlen(kmip_keyring->kmip_cert_path) == 0) + if (kmip_keyring->kmip_host == NULL || kmip_keyring->kmip_host[0] == '\0' || + kmip_keyring->kmip_port == NULL || kmip_keyring->kmip_port[0] == '\0' || + kmip_keyring->kmip_ca_path == NULL || kmip_keyring->kmip_ca_path[0] == '\0' || + kmip_keyring->kmip_cert_path == NULL || kmip_keyring->kmip_cert_path[0] == '\0') { ereport(WARNING, errcode(ERRCODE_INVALID_PARAMETER_VALUE),