From 62acbdaae45505bfa49fa80c730d0b289cfb6c0b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 30 Jan 2014 18:10:06 -0500
Subject: [PATCH] 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.
---
 contrib/pg_upgrade/check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index e9e9a4fe339..32b9bb998ae 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -979,7 +979,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);
 
-- 
GitLab