From: Andres Freund <andres@anarazel.de>
Date: Wed, 23 Mar 2022 20:05:59 +0000 (-0700)
Subject: Don't try to translate NULL in GetConfigOptionByNum().
X-Git-Tag: REL_12_11~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a007feed526f2acde4822e27a599cb0a734dfe;p=thirdparty%2Fpostgresql.git

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-
---

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 1dd8c5674fc..086b666cc13 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -9051,7 +9051,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];