Fix crash in ICU patch

petere · petere · commit 524e0f7ac8e1 · 2017-03-23T16:31:39.000-04:00
This only happened with single-byte encodings.
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ Generic_Text_IC_like(text str, text pat, Oid collation)`
`194`	`194`	`* long way.`
`195`	`195`	`*/`
`196`	`196`
`197`		`- if (pg_database_encoding_max_length() > 1 \|\| locale->provider == COLLPROVIDER_ICU)`
	`197`	`+ if (pg_database_encoding_max_length() > 1 \|\| (locale && locale->provider == COLLPROVIDER_ICU))`
`198`	`198`	`{`
`199`	`199`	`/* lower's result is never packed, so OK to use old macros here */`
`200`	`200`	`pat = DatumGetTextPP(DirectFunctionCall1Coll(lower, collation,`