Fix ICU collation use on Windows

petere · petere · commit 41839b7abc85 · 2017-06-16T10:08:54.000-04:00
Windows uses a separate code path for libc locales.  The code previously
ended up there also if an ICU collation should be used, leading to a
crash.

Reported-by: Ashutosh Sharma &lt;ashu.coek88@gmail.com&gt;
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -1433,7 +1433,8 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
 
 #ifdef WIN32
 		/* Win32 does not have UTF-8, so we need to map to UTF-16 */
-		if (GetDatabaseEncoding() == PG_UTF8)
+		if (GetDatabaseEncoding() == PG_UTF8
+			&& (!mylocale || mylocale->provider == COLLPROVIDER_LIBC))
 		{
 			int			a1len;
 			int			a2len;

Original file line number	Diff line number	Diff line change
`@@ -1433,7 +1433,8 @@ varstr_cmp(char arg1, int len1, char arg2, int len2, Oid collid)`
`1433`	`1433`
`1434`	`1434`	`#ifdef WIN32`
`1435`	`1435`	`/* Win32 does not have UTF-8, so we need to map to UTF-16 */`
`1436`		`- if (GetDatabaseEncoding() == PG_UTF8)`
	`1436`	`+ if (GetDatabaseEncoding() == PG_UTF8`
	`1437`	`+ && (!mylocale \|\| mylocale->provider == COLLPROVIDER_LIBC))`
`1437`	`1438`	`{`
`1438`	`1439`	`int a1len;`
`1439`	`1440`	`int a2len;`