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

tglsfdc · tglsfdc · commit 3117afa75d6c · 2005-08-08T23:39:01.000Z
SIGHUP; it's not OK for an assign_hook to return a non-malloc'd string.
Problem was introduced during timezone library rewrite.
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * 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
 			 * 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
 		{

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`		`- const char *curzone = pg_get_timezone_name(global_timezone);`
	`349`	`+ if (doit)`
	`350`	`+ {`
	`351`	`+ const char *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`	`{`