Commit3117afa

committed

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.

1 parent2dd9672 commit3117afaCopy full SHA for 3117afa

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.112 2005/07/25 22:12:32 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.113 2005/08/08 23:39:01 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -346,10 +346,13 @@ assign_timezone(const char *value, bool doit, GucSource source)`
`346`	`346`	`* pg_timezone_initialize() will eventually select a default`
`347`	`347`	`* value from the environment.`
`348`	`348`	`*/`
`349`		`-constchar*curzone=pg_get_timezone_name(global_timezone);`
	`349`	`+if (doit)`
	`350`	`+{`
	`351`	`+constchar*curzone=pg_get_timezone_name(global_timezone);`
`350`	`352`
`351`		`-if (curzone)`
`352`		`-value=curzone;`
	`353`	`+if (curzone)`
	`354`	`+value=curzone;`
	`355`	`+}`
`353`	`356`	`}`
`354`	`357`	`else`
`355`	`358`	`{`

Comments

(0)