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

patch 7.4.1783

Browse Source 
Problem:    The old regexp engine doesn't handle character classes correctly.
            (Manuel Ortega)
Solution:   Use regmbc() instead of regc().  Add a test.
This commit is contained in:
Bram Moolenaar
2016-04-24 14:40:12 +02:00
parent fca6600305
commit af98a49dd0
3 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/regexp.c
View File

@@ -2544,12 +2544,12 @@ collection:
case CLASS_ALNUM:
for (cu = 1; cu <= 255; cu++)
if (isalnum(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_ALPHA:
for (cu = 1; cu <= 255; cu++)
if (isalpha(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_BLANK:
regc(' ');
@@ -2558,32 +2558,32 @@ collection:
case CLASS_CNTRL:
for (cu = 1; cu <= 255; cu++)
if (iscntrl(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_DIGIT:
for (cu = 1; cu <= 255; cu++)
if (VIM_ISDIGIT(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_GRAPH:
for (cu = 1; cu <= 255; cu++)
if (isgraph(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_LOWER:
for (cu = 1; cu <= 255; cu++)
if (MB_ISLOWER(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_PRINT:
for (cu = 1; cu <= 255; cu++)
if (vim_isprintc(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_PUNCT:
for (cu = 1; cu <= 255; cu++)
if (ispunct(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_SPACE:
for (cu = 9; cu <= 13; cu++)
@@ -2593,12 +2593,12 @@ collection:
case CLASS_UPPER:
for (cu = 1; cu <= 255; cu++)
if (MB_ISUPPER(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_XDIGIT:
for (cu = 1; cu <= 255; cu++)
if (vim_isxdigit(cu))
regc(cu);
regmbc(cu);
break;
case CLASS_TAB:
regc('\t');