Tweak newly added set_config_sourcefile() so that the target record

tglsfdc · tglsfdc · commit b8646012d560 · 2008-09-10T19:16:22.000Z
isn't left corrupt if guc_strdup should fail.
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.471 2008/09/10 18:09:19 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.472 2008/09/10 19:16:22 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -5128,9 +5128,10 @@ set_config_sourcefile(const char *name, char *sourcefile, int sourceline)
 	if (record == NULL)
 		elog(ERROR, "unrecognized configuration parameter \"%s\"", name);
 
+	sourcefile = guc_strdup(elevel, sourcefile);
 	if (record->sourcefile)
 		free(record->sourcefile);
-	record->sourcefile = guc_strdup(elevel, sourcefile);
+	record->sourcefile = sourcefile;
 	record->sourceline = sourceline;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.471 2008/09/10 18:09:19 alvherre Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.472 2008/09/10 19:16:22 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -5128,9 +5128,10 @@ set_config_sourcefile(const char name, char sourcefile, int sourceline)`
`5128`	`5128`	`if (record == NULL)`
`5129`	`5129`	`elog(ERROR, "unrecognized configuration parameter \"%s\"", name);`
`5130`	`5130`
	`5131`	`+ sourcefile = guc_strdup(elevel, sourcefile);`
`5131`	`5132`	`if (record->sourcefile)`
`5132`	`5133`	`free(record->sourcefile);`
`5133`		`- record->sourcefile = guc_strdup(elevel, sourcefile);`
	`5134`	`+ record->sourcefile = sourcefile;`
`5134`	`5135`	`record->sourceline = sourceline;`
`5135`	`5136`	`}`
`5136`	`5137`