Merge branch 'PGPRO10_DEV' into PGPRO10

Author: vbwagner

src/port/chklocale.c

@@ -959,12 +959,12 @@ check_icu_winlocale(const char *winlocale)
 		}
 		else
 		{
-			size_t		locale_size = strlen(winlocale) + 1;
-			size_t		locale_wsize = locale_size * sizeof(wchar_t);
-			wchar_t	   *wlocale = (wchar_t*) ALLOC(locale_wsize);
+			size_t		locale_len = strlen(winlocale);
+			wchar_t	   *wlocale = (wchar_t*) ALLOC(
+				(locale_len + 1) * sizeof(wchar_t));
 			/* Locale names use only ASCII */
-			size_t		locale_wlen = char2wchar_ascii(wlocale, locale_wsize,
-													   winlocale, locale_size);
+			size_t		locale_wlen = char2wchar_ascii(wlocale, locale_len + 1,
+													   winlocale, locale_len);
 			if (locale_wlen == -1)
 			{
 				/* there's an error */