database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix crash when reading 'timezone = unknown' from postgresql.conf during

Browse Source 
SIGHUP; it's not OK for an assign_hook to return a non-malloc'd string.
Problem was introduced during timezone library rewrite.
This commit is contained in:
Tom Lane
2005-08-08 23:39:01 +00:00
parent 2dd9672d96
commit 3117afa75d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/commands/variable.c
View File

@ -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,10 +346,13 @@ 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.
*/ */
const char *curzone = pg_get_timezone_name(global_timezone); if (doit)
{
const char *curzone = pg_get_timezone_name(global_timezone);
if (curzone) if (curzone)
value = curzone; value = curzone;
}
} }
else else
{ {