Commitc0f99bb

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 parent8014c61 commitc0f99bbCopy full SHA for c0f99bb

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9282,7 +9282,7 @@ GetConfigOptionByNum(int varnum, const char *values, bool noshow)`
`9282`	`9282`	`values[4]=_(conf->short_desc);`
`9283`	`9283`
`9284`	`9284`	`/* extra_desc */`
`9285`		`-values[5]=_(conf->long_desc);`
	`9285`	`+values[5]=conf->long_desc!=NULL ?_(conf->long_desc) :NULL;`
`9286`	`9286`
`9287`	`9287`	`/* context */`
`9288`	`9288`	`values[6]=GucContext_Names[conf->context];`

Comments

(0)