diff options
| author | Andres Freund <andres@anarazel.de> | 2022-03-23 13:05:59 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-03-23 13:18:00 -0700 |
| commit | c0f99bb520da577f34cf7c10e1ea4aab727f08c7 (patch) | |
| tree | a924b3c40b6a9c80c303f939e475135359c0e388 /src | |
| parent | 8014c61ebda10d39ef8855b4826aeba5cacd36e1 (diff) | |
| download | postgresql-c0f99bb520da577f34cf7c10e1ea4aab727f08c7.tar.gz postgresql-c0f99bb520da577f34cf7c10e1ea4aab727f08c7.zip | |
Don't try to translate NULL in GetConfigOptionByNum().
Noticed via -fsanitize=undefined. Introduced when a few columns in
GetConfigOptionByNum() / pg_settings started to be translated in 72be8c29a /
PG 12.
Backpatch to all affected branches, for the same reasons as 46ab07ffda9.
Discussion: https://postgr.es/m/20220323173537.ll7klrglnp4gn2um@alap3.anarazel.de
Backpatch: 12-
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index f7a3297161f..d154365903a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -9282,7 +9282,7 @@ GetConfigOptionByNum(int varnum, const char **values, bool *noshow) values[4] = _(conf->short_desc); /* extra_desc */ - values[5] = _(conf->long_desc); + values[5] = conf->long_desc != NULL ? _(conf->long_desc) : NULL; /* context */ values[6] = GucContext_Names[conf->context]; |