From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 23 Mar 2017 20:31:39 +0000 (-0400)
Subject: Fix crash in ICU patch
X-Git-Tag: REL_10_BETA1~538
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=524e0f7ac8e143e377b8acff24796d7e37b3a9b1;p=thirdparty%2Fpostgresql.git

Fix crash in ICU patch

This only happened with single-byte encodings.
---

diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 1f683ccd0f7..b9806069c21 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -194,7 +194,7 @@ Generic_Text_IC_like(text *str, text *pat, Oid collation)
 	 * long way.
 	 */
 
-	if (pg_database_encoding_max_length() > 1 || locale->provider == COLLPROVIDER_ICU)
+	if (pg_database_encoding_max_length() > 1 || (locale && locale->provider == COLLPROVIDER_ICU))
 	{
 		/* lower's result is never packed, so OK to use old macros here */
 		pat = DatumGetTextPP(DirectFunctionCall1Coll(lower, collation,