Commit 3117afa7 authored by Tom Lane's avatar Tom Lane

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.
parent 2dd9672d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.112 2005/07/25 22:12:32 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.113 2005/08/08 23:39:01 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -346,11 +346,14 @@ assign_timezone(const char *value, bool doit, GucSource source) ...@@ -346,11 +346,14 @@ assign_timezone(const char *value, bool doit, GucSource source)
* pg_timezone_initialize() will eventually select a default * pg_timezone_initialize() will eventually select a default
* value from the environment. * value from the environment.
*/ */
if (doit)
{
const char *curzone = pg_get_timezone_name(global_timezone); const char *curzone = pg_get_timezone_name(global_timezone);
if (curzone) if (curzone)
value = curzone; value = curzone;
} }
}
else else
{ {
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment