Commit 41e364ec authored by Tom Lane's avatar Tom Lane

Fix potential coredump on bad locale value in pg_upgrade.

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.
parent 760c770f
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment