postgres.git / summary / log / commit / refs

commit    61a007feed526f2acde4822e27a599cb0a734dfe
Author:   Andres Freund <andres@anarazel.de>
Date:     Wed Mar 23 20:05:59 2022 +0000
First released in: 15.0, 12.11, 13.7, 14.3

    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-


 src/backend/utils/misc/guc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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


[parent: c5b60a68cc08]