Fix CORE-6145 - Wrong result in "similar to" with non latin characters.

src/jrd/Collation.cpp

@@ -116,6 +116,7 @@ class Re2SimilarMatcher : public PatternMatcher
 	Re2SimilarMatcher(thread_db* tdbb, MemoryPool& pool, TextType* textType,
 			const UCHAR* patternStr, SLONG patternLen, const UCHAR* escapeStr, SLONG escapeLen)
 		: PatternMatcher(pool, textType),
+		  converter(INTL_convert_lookup(tdbb, CS_UTF8, textType->getCharSet()->getId())),
 		  buffer(pool)
 	{
 		UCharBuffer patternBuffer, escapeBuffer;
@@ -131,8 +132,6 @@ class Re2SimilarMatcher : public PatternMatcher
 			flags |= (textType->getFlags() & TEXTTYPE_ATTR_CASE_INSENSITIVE) ?
 				SimilarToRegex::FLAG_CASE_INSENSITIVE : 0;
 
-			CsConvert converter = INTL_convert_lookup(tdbb, CS_UTF8, charSetId);
-
 			converter.convert(patternLen, patternStr, patternBuffer);
 
 			if (textType->getFlags() & TEXTTYPE_ATTR_ACCENT_INSENSITIVE)
@@ -190,13 +189,24 @@ class Re2SimilarMatcher : public PatternMatcher
 
 	virtual bool result()
 	{
+		UCharBuffer utfBuffer;
+		const auto charSetId = textType->getCharSet()->getId();
+		UCharBuffer* bufferPtr = &buffer;
+
+		if (charSetId != CS_NONE && charSetId != CS_BINARY && charSetId != CS_UTF8)
+		{
+			converter.convert(buffer.getCount(), buffer.begin(), utfBuffer);
+			bufferPtr = &utfBuffer;
+		}
+
 		if (textType->getFlags() & TEXTTYPE_ATTR_ACCENT_INSENSITIVE)
-			UnicodeUtil::utf8Normalize(buffer);
+			UnicodeUtil::utf8Normalize(*bufferPtr);
 
-		return regex->matches((const char*) buffer.begin(), buffer.getCount());
+		return regex->matches((const char*) bufferPtr->begin(), bufferPtr->getCount());
 	}
 
 private:
+	CsConvert converter;
 	AutoPtr<SimilarToRegex> regex;
 	UCharBuffer buffer;
 };
@@ -207,6 +217,7 @@ class Re2SubstringSimilarMatcher : public BaseSubstringSimilarMatcher
 	Re2SubstringSimilarMatcher(thread_db* tdbb, MemoryPool& pool, TextType* textType,
 			const UCHAR* patternStr, SLONG patternLen, const UCHAR* escapeStr, SLONG escapeLen)
 		: BaseSubstringSimilarMatcher(pool, textType),
+		  converter(INTL_convert_lookup(tdbb, CS_UTF8, textType->getCharSet()->getId())),
 		  buffer(pool),
 		  resultStart(0),
 		  resultLength(0)
@@ -224,8 +235,6 @@ class Re2SubstringSimilarMatcher : public BaseSubstringSimilarMatcher
 			flags |= (textType->getFlags() & TEXTTYPE_ATTR_CASE_INSENSITIVE) ?
 				SubstringSimilarRegex::FLAG_CASE_INSENSITIVE : 0;
 
-			CsConvert converter = INTL_convert_lookup(tdbb, textType->getCharSet()->getId(), CS_UTF8);
-
 			converter.convert(patternLen, patternStr, patternBuffer);
 
 			if (textType->getFlags() & TEXTTYPE_ATTR_ACCENT_INSENSITIVE)
@@ -289,10 +298,20 @@ class Re2SubstringSimilarMatcher : public BaseSubstringSimilarMatcher
 
 	virtual bool result()
 	{
+		UCharBuffer utfBuffer;
+		const auto charSetId = textType->getCharSet()->getId();
+		UCharBuffer* bufferPtr = &buffer;
+
+		if (charSetId != CS_NONE && charSetId != CS_BINARY && charSetId != CS_UTF8)
+		{
+			converter.convert(buffer.getCount(), buffer.begin(), utfBuffer);
+			bufferPtr = &utfBuffer;
+		}
+
 		if (textType->getFlags() & TEXTTYPE_ATTR_ACCENT_INSENSITIVE)
-			UnicodeUtil::utf8Normalize(buffer);
+			UnicodeUtil::utf8Normalize(*bufferPtr);
 
-		return regex->matches((const char*) buffer.begin(), buffer.getCount(), &resultStart, &resultLength);
+		return regex->matches((const char*) bufferPtr->begin(), bufferPtr->getCount(), &resultStart, &resultLength);
 	}
 
 	virtual void getResultInfo(unsigned* start, unsigned* length)
@@ -302,6 +321,7 @@ class Re2SubstringSimilarMatcher : public BaseSubstringSimilarMatcher
 	}
 
 private:
+	CsConvert converter;
 	AutoPtr<SubstringSimilarRegex> regex;
 	UCharBuffer buffer;
 	unsigned resultStart, resultLength;