Fixed a word boundary check bug in JIT when partial matching is enabled.

This commit is contained in:
zherczeg 2020-10-27 08:16:04 +00:00
parent 2f8836a4d7
commit 09155786d1
4 changed files with 14 additions and 0 deletions

View File

@ -90,6 +90,8 @@ whose code points are greater than 255 in Unicode mode.
test for a version of sed that can handle binary zero, instead of assuming that test for a version of sed that can handle binary zero, instead of assuming that
any Linux version will work. any Linux version will work.
18. Fixed a word boundary check bug in JIT when partial matching is enabled.
Version 10.35 09-May-2020 Version 10.35 09-May-2020
--------------------------- ---------------------------

View File

@ -6571,9 +6571,11 @@ if (common->invalid_utf)
if (common->mode != PCRE2_JIT_COMPLETE) if (common->mode != PCRE2_JIT_COMPLETE)
{ {
OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
OP1(SLJIT_MOV, TMP2, 0, STR_PTR, 0); OP1(SLJIT_MOV, TMP2, 0, STR_PTR, 0);
move_back(common, NULL, TRUE); move_back(common, NULL, TRUE);
check_start_used_ptr(common); check_start_used_ptr(common);
OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
OP1(SLJIT_MOV, STR_PTR, 0, TMP2, 0); OP1(SLJIT_MOV, STR_PTR, 0, TMP2, 0);
} }
} }

View File

@ -613,4 +613,8 @@
/A/utf,match_invalid_utf,caseless /A/utf,match_invalid_utf,caseless
\xe5A \xe5A
/\bch\b/utf,match_invalid_utf
qchq\=ph
qchq\=ps
# End of testinput10 # End of testinput10

View File

@ -1875,4 +1875,10 @@ Subject length lower bound = 1
\xe5A \xe5A
0: A 0: A
/\bch\b/utf,match_invalid_utf
qchq\=ph
Partial match:
qchq\=ps
Partial match:
# End of testinput10 # End of testinput10