]> granicus.if.org Git - postgresql/commitdiff
Fix crash in ICU patch
authorPeter Eisentraut <peter_e@gmx.net>
Thu, 23 Mar 2017 20:31:39 +0000 (16:31 -0400)
committerPeter Eisentraut <peter_e@gmx.net>
Thu, 23 Mar 2017 20:31:39 +0000 (16:31 -0400)
This only happened with single-byte encodings.

src/backend/utils/adt/like.c

index 1f683ccd0f7acc905d9f1b2c32dcd130ade566c5..b9806069c212a6a0aabd5d004e6424278e3a13a0 100644 (file)
@@ -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,