Commit81045e1

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 parent89a94c2 commit81045e1Copy full SHA for 81045e1

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9601,7 +9601,7 @@ GetConfigOptionByNum(int varnum, const char *values, bool noshow)`
`9601`	`9601`	`values[4]=_(conf->short_desc);`
`9602`	`9602`
`9603`	`9603`	`/* extra_desc */`
`9604`		`-values[5]=_(conf->long_desc);`
	`9604`	`+values[5]=conf->long_desc!=NULL ?_(conf->long_desc) :NULL;`
`9605`	`9605`
`9606`	`9606`	`/* context */`
`9607`	`9607`	`values[6]=GucContext_Names[conf->context];`

Comments

(0)