rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 14:31:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential coredump on bad locale value in pg_upgrade.

Browse Source 
Thinko in error report (and a typo in the message text, too).  We're
failing anyway, but it would be good to print something useful first.
Noted while reviewing a patch to make pg_upgrade's locale code laxer.
This commit is contained in:
Tom Lane 2014-01-30 18:10:01 -05:00
parent 760c770ff6
commit 41e364ec67
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/pg_upgrade/check.c
View File

@ -990,6 +990,7 @@ get_canonical_locale_name(int category, const char *locale)
char *save;
char *res;
/* get the current setting, so we can restore it. */
save = setlocale(category, NULL);
if (!save)
pg_fatal("failed to get the current locale\n");
@ -1001,7 +1002,7 @@ get_canonical_locale_name(int category, const char *locale)
res = setlocale(category, locale);
if (!res)
pg_fatal("failed to get system local name for \"%s\"\n", res);
pg_fatal("failed to get system locale name for \"%s\"\n", locale);
res = pg_strdup(res);