Commit61a007f

committed

Don't try to translate NULL in GetConfigOptionByNum().

Noticed via -fsanitize=undefined. Introduced when a few columns inGetConfigOptionByNum() / pg_settings started to be translated in72be8c2 /PG 12.Backpatch to all affected branches, for the same reasons as46ab07f.Discussion:https://postgr.es/m/20220323173537.ll7klrglnp4gn2um@alap3.anarazel.deBackpatch: 12-

1 parentc5b60a6 commit61a007fCopy full SHA for 61a007f

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9051,7 +9051,7 @@ GetConfigOptionByNum(int varnum, const char *values, bool noshow)`
`9051`	`9051`	`values[4]=_(conf->short_desc);`
`9052`	`9052`
`9053`	`9053`	`/* extra_desc */`
`9054`		`-values[5]=_(conf->long_desc);`
	`9054`	`+values[5]=conf->long_desc!=NULL ?_(conf->long_desc) :NULL;`
`9055`	`9055`
`9056`	`9056`	`/* context */`
`9057`	`9057`	`values[6]=GucContext_Names[conf->context];`

Comments

(0)