thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0011: regexp cannot match combining chars in collection

Browse Source 
Problem:  regexp cannot match combining chars in collection
Solution: Check for combining characters in regex collections for the
          NFA and BT Regex Engine

Also, while at it, make debug mode work again.

fixes #10286
closes: #12871

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-01-04 22:54:08 +01:00
parent 81642d9d6f
commit d2cc51f9a1
6 changed files with 166 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/regexp_bt.c
View File

@@ -3743,13 +3743,38 @@ regmatch(
case ANYOF:
case ANYBUT:
if (c == NUL)
status = RA_NOMATCH;
else if ((cstrchr(OPERAND(scan), c) == NULL) == (op == ANYOF))
status = RA_NOMATCH;
else
ADVANCE_REGINPUT();
break;
{
char_u *q = OPERAND(scan);
if (c == NUL)
status = RA_NOMATCH;
else if ((cstrchr(q, c) == NULL) == (op == ANYOF))
status = RA_NOMATCH;
else
{
// Check following combining characters
int len = 0;
int i;
if (enc_utf8)
len = utfc_ptr2len(q) - utf_ptr2len(q);
MB_CPTR_ADV(rex.input);
MB_CPTR_ADV(q);
if (!enc_utf8 || len == 0)
break;
for (i = 0; i < len; ++i)
if (q[i] != rex.input[i])
{
status = RA_NOMATCH;
break;
}
rex.input += len;
}
break;
}
case MULTIBYTECODE:
if (has_mbyte)