mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The recent patch to log changes in postgresql.conf settings dumped core

Browse Source 
if the initial value of a string variable was NULL, which is entirely
possible.  Noted while experimenting with custom_variable_classes.
This commit is contained in:
Tom Lane 2009-11-12 18:20:23 +00:00
parent 8539a0e00a
commit 0894c6b838
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/backend/utils/misc/guc-file.l
View File

@ -4,7 +4,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * Copyright (c) 2000-2009, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.62 2009/10/03 18:04:57 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.63 2009/11/12 18:20:23 tgl Exp $
*/ */
%{ %{
@ -316,18 +316,33 @@ ProcessConfigFile(GucContext context)
/* In SIGHUP cases in the postmaster, report changes */ /* In SIGHUP cases in the postmaster, report changes */
if (context == PGC_SIGHUP && !IsUnderPostmaster) if (context == PGC_SIGHUP && !IsUnderPostmaster)
pre_value = pstrdup(GetConfigOption(item->name, false)); {
const char *preval = GetConfigOption(item->name, false);
/* string variables could be NULL; treat that as empty */
if (!preval)
preval = "";
/* must dup, else might have dangling pointer below */
pre_value = pstrdup(preval);
}
if (set_config_option(item->name, item->value, context, if (set_config_option(item->name, item->value, context,
PGC_S_FILE, GUC_ACTION_SET, true)) PGC_S_FILE, GUC_ACTION_SET, true))
{ {
set_config_sourcefile(item->name, item->filename, set_config_sourcefile(item->name, item->filename,
item->sourceline); item->sourceline);
if (pre_value &&
strcmp(pre_value, GetConfigOption(item->name, false)) != 0) if (pre_value)
ereport(elevel, {
(errmsg("parameter \"%s\" changed to \"%s\"", const char *post_value = GetConfigOption(item->name, false);
item->name, item->value)));
if (!post_value)
post_value = "";
if (strcmp(pre_value, post_value) != 0)
ereport(elevel,
(errmsg("parameter \"%s\" changed to \"%s\"",
item->name, item->value)));
}
} }
if (pre_value) if (pre_value)