walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve exact character repeat length check.

This commit is contained in:
Zoltán Herczeg 2015-06-17 11:32:06 +00:00
parent 870f975707
commit a68ddd48b5
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pcre2_jit_compile.c
View File

@ -8079,11 +8079,28 @@ switch(type)
/* Handle fixed part first. */ /* Handle fixed part first. */
if (exact > 1) if (exact > 1)
{ {
OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact); if (common->mode == PCRE2_JIT_COMPLETE
label = LABEL(); #ifdef SUPPORT_UNICODE
compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE); && !common->utf
OP2(SLJIT_SUB | SLJIT_SET_E, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1); #endif
JUMPTO(SLJIT_NOT_ZERO, label); )
{
OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(exact));
add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_GREATER, TMP1, 0, STR_END, 0));
OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact);
label = LABEL();
compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, FALSE);
OP2(SLJIT_SUB | SLJIT_SET_E, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
JUMPTO(SLJIT_NOT_ZERO, label);
}
else
{
OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact);
label = LABEL();
compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE);
OP2(SLJIT_SUB | SLJIT_SET_E, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
JUMPTO(SLJIT_NOT_ZERO, label);
}
} }
else if (exact == 1) else if (exact == 1)
compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE); compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE);