From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 30 Jan 2014 23:10:04 +0000 (-0500)
Subject: Fix potential coredump on bad locale value in pg_upgrade.
X-Git-Tag: REL9_3_3~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1b242b1646137450860cb80683de27be2d86fae;p=postgresql

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.
---

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 1f67e602de..bacd41e075 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -1004,7 +1004,7 @@ get_canonical_locale_name(int category, const char *locale)
 	res = setlocale(category, locale);
 
 	if (!res)
-		pg_log(PG_FATAL, "failed to get system local name for \"%s\"\n", res);
+		pg_log(PG_FATAL, "failed to get system locale name for \"%s\"\n", locale);
 
 	res = pg_strdup(res);