NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit41e364e

committed

Fix potential coredump on bad locale value in pg_upgrade.

Thinko in error report (and a typo in the message text, too). We'refailing anyway, but it would be good to print something useful first.Noted while reviewing a patch to make pg_upgrade's locale code laxer.

1 parent760c770 commit41e364eCopy full SHA for 41e364e

File tree

1 file changed

-1

lines changed

contrib/pg_upgrade
- check.c

1 file changed

-1

lines changed

`‎contrib/pg_upgrade/check.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -990,6 +990,7 @@ get_canonical_locale_name(int category, const char *locale)`
`990`	`990`	`char*save;`
`991`	`991`	`char*res;`
`992`	`992`
	`993`	`+/* get the current setting, so we can restore it. */`
`993`	`994`	`save=setlocale(category,NULL);`
`994`	`995`	`if (!save)`
`995`	`996`	`pg_fatal("failed to get the current locale\n");`
`@@ -1001,7 +1002,7 @@ get_canonical_locale_name(int category, const char *locale)`
`1001`	`1002`	`res=setlocale(category,locale);`
`1002`	`1003`
`1003`	`1004`	`if (!res)`
`1004`		`-pg_fatal("failed to get systemlocal name for \"%s\"\n",res);`
	`1005`	`+pg_fatal("failed to get systemlocale name for \"%s\"\n",locale);`
`1005`	`1006`
`1006`	`1007`	`res=pg_strdup(res);`
`1007`	`1008`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit41e364e

File tree

1 file changed

1 file changed

`‎contrib/pg_upgrade/check.c`

0 commit comments