database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Be more wary about NULL values for GUC string variables.

Browse Source 
get_explain_guc_options() crashed if a string GUC marked GUC_EXPLAIN
has a NULL boot_val.  Nosing around found a couple of other places
that seemed insufficiently cautious about NULL string values, although
those are likely unreachable in practice.  Add some commentary
defining the expectations for NULL values of string variables,
in hopes of forestalling future additions of more such bugs.

Xing Guo, Aleksander Alekseev, Tom Lane

Discussion: https://postgr.es/m/CACpMh+AyDx5YUpPaAgzVwC1d8zfOL4JoD-uyFDnNSa1z0EsDQQ@mail.gmail.com
This commit is contained in:
Tom Lane 2023-11-02 11:47:33 -04:00
parent e22819a747
commit 82063edd4a
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/utils/misc/guc.c
View File

@ -1445,7 +1445,9 @@ check_GUC_init(struct config_generic *gconf)
{
struct config_string *conf = (struct config_string *) gconf;
if (*conf->variable != NULL && strcmp(*conf->variable, conf->boot_val) != 0)
if (*conf->variable != NULL &&
(conf->boot_val == NULL ||
strcmp(*conf->variable, conf->boot_val) != 0))
{
elog(LOG, "GUC (PGC_STRING) %s, boot_val=%s, C-var=%s",
conf->gen.name, conf->boot_val ? conf->boot_val : "<null>", *conf->variable);
@ -5215,7 +5217,14 @@ get_explain_guc_options(int *num)
{
struct config_string *lconf = (struct config_string *) conf;
modified = (strcmp(lconf->boot_val, *(lconf->variable)) != 0);
if (lconf->boot_val == NULL &&
*lconf->variable == NULL)
modified = false;
else if (lconf->boot_val == NULL ||
*lconf->variable == NULL)
modified = true;
else
modified = (strcmp(lconf->boot_val, *(lconf->variable)) != 0);
}
break;
@ -5442,7 +5451,8 @@ write_one_nondefault_variable(FILE *fp, struct config_generic *gconf)
{
struct config_string *conf = (struct config_string *) gconf;
fprintf(fp, "%s", *conf->variable);
if (*conf->variable)
fprintf(fp, "%s", *conf->variable);
}
break;

10
src/include/utils/guc_tables.h
View File

@ -240,6 +240,16 @@ struct config_real
void *reset_extra;
};
/*
* A note about string GUCs: the boot_val is allowed to be NULL, which leads
* to the reset_val and the actual variable value (*variable) also being NULL.
* However, there is no way to set a NULL value subsequently using
* set_config_option or any other GUC API. Also, GUC APIs such as SHOW will
* display a NULL value as an empty string. Callers that choose to use a NULL
* boot_val should overwrite the setting later in startup, or else be careful
* that NULL doesn't have semantics that are visibly different from an empty
* string.
*/
struct config_string
{
struct config_generic gen;