From: Jeff Davis <jdavis@postgresql.org>
Date: Fri, 11 Oct 2024 23:57:48 +0000 (-0700)
Subject: Fix missed case for builtin collation provider.
X-Git-Tag: REL_18_BETA1~1733
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=98c5b191e74b65b74149bb436b057d7007d401a7;p=postgresql.git

Fix missed case for builtin collation provider.

A missed check for the builtin collation provider could result in
falling through to call isalpha().

This does not appear to have practical consequences because it only
happens for characters in the ASCII range. Regardless, the builtin
provider should not be calling libc functions, so backpatch.

Discussion: https://postgr.es/m/1bd5a0a5192f82c22ee7527e825b18ab0028b2c7.camel@j-davis.com
Backpatch-through: 17
---

diff --git a/src/backend/utils/adt/like_support.c b/src/backend/utils/adt/like_support.c
index 79c4ddc7573..8b15509a3bf 100644
--- a/src/backend/utils/adt/like_support.c
+++ b/src/backend/utils/adt/like_support.c
@@ -1500,13 +1500,11 @@ pattern_char_isalpha(char c, bool is_multibyte,
 		return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
 	else if (is_multibyte && IS_HIGHBIT_SET(c))
 		return true;
-	else if (locale->provider == COLLPROVIDER_ICU)
+	else if (locale->provider != COLLPROVIDER_LIBC)
 		return IS_HIGHBIT_SET(c) ||
 			(c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-	else if (locale->provider == COLLPROVIDER_LIBC)
-		return isalpha_l((unsigned char) c, locale->info.lt);
 	else
-		return isalpha((unsigned char) c);
+		return isalpha_l((unsigned char) c, locale->info.lt);
 }