Commit3ac7d02

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 parent1c6bb38 commit3ac7d02Copy full SHA for 3ac7d02

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9797,7 +9797,7 @@ GetConfigOptionByNum(int varnum, const char *values, bool noshow)`
`9797`	`9797`	`values[4]=_(conf->short_desc);`
`9798`	`9798`
`9799`	`9799`	`/* extra_desc */`
`9800`		`-values[5]=_(conf->long_desc);`
	`9800`	`+values[5]=conf->long_desc!=NULL ?_(conf->long_desc) :NULL;`
`9801`	`9801`
`9802`	`9802`	`/* context */`
`9803`	`9803`	`values[6]=GucContext_Names[conf->context];`

Comments

(0)