firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 10:43:03 +01:00
Code Issues

Fixed CORE-4740 - SIMILAR TO with quantifier {n,} in the pattern: 1) fails on 2.5 ("Invalid pattern"), 2) strange result in 3.0.

Browse Source
This commit is contained in:
asfernandes 2015-05-20 15:27:02 +00:00
parent 364995fb88
commit 003be8071e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jrd/SimilarToMatcher.h
View File

@ -1380,6 +1380,7 @@ bool SimilarToMatcher<CharType, StrConverter>::Evaluator::match()
if (*repeatCount < repeatNode->len2) if (*repeatCount < repeatNode->len2)
{ {
++*repeatCount; ++*repeatCount;
scope->save = bufferPos;
scopeStack.push(repeatNode + 1); scopeStack.push(repeatNode + 1);
continue; continue;
} }
@ -1389,6 +1390,8 @@ bool SimilarToMatcher<CharType, StrConverter>::Evaluator::match()
case ENCODE_OP_STATE(opRepeatEnd, msReturningFalse): case ENCODE_OP_STATE(opRepeatEnd, msReturningFalse):
{ {
bufferPos = scope->save;
const Node* repeatNode = scope->i + node->ref; const Node* repeatNode = scope->i + node->ref;
SLONG* repeatCount = repeatStack.back; SLONG* repeatCount = repeatStack.back;