From a7b4bc835d436cf3efe7b7ec1127407d1fc745cf Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 8 Aug 2005 23:39:14 +0000 Subject: [PATCH] Fix crash when reading 'timezone = unknown' from postgresql.conf during SIGHUP; it's not OK for an assign_hook to return a non-malloc'd string. Problem was introduced during timezone library rewrite. --- src/backend/commands/variable.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index b975b6f45f..e55bb84cdf 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -346,10 +346,13 @@ assign_timezone(const char *value, bool doit, GucSource source) * pg_timezone_initialize() will eventually select a default * value from the environment. */ - const char *curzone = pg_get_timezone_name(global_timezone); + if (doit) + { + const char *curzone = pg_get_timezone_name(global_timezone); - if (curzone) - value = curzone; + if (curzone) + value = curzone; + } } else { -- 2.39.5