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:05:59 -0700 |
| commit | 3ac7d024122f26d828907f15d088dcd67d2eb4f1 (patch) | |
| tree | 40f2a165b89a34d75a0a468c647095ddba444d5b | |
| parent | 1c6bb380e5aba195204a9c6d0b4713bd1b3dec9c (diff) | |
| download | postgresql-3ac7d024122f26d828907f15d088dcd67d2eb4f1.tar.gz postgresql-3ac7d024122f26d828907f15d088dcd67d2eb4f1.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-
| -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 932aefc777d..f70f7f5c01e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -9797,7 +9797,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]; |