39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
diff --git a/ChangeLog b/ChangeLog
|
|
index d27542d..cb7a0f2 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1081,6 +1081,9 @@ recursions. Iterators at the ends of capturing groups are no longer considered
|
|
for auto-possessification if the pattern contains any recursions. Fixes
|
|
Bugzilla #2232.
|
|
|
|
+23. Fixed a unicode properrty matching issue in JIT. The character was not
|
|
+fully read in caseless matching.
|
|
+
|
|
|
|
Version 10.30 14-August-2017
|
|
----------------------------
|
|
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
|
|
index db2ce65..5fbee09 100644
|
|
--- a/src/pcre2_jit_compile.c
|
|
+++ b/src/pcre2_jit_compile.c
|
|
@@ -7473,7 +7473,7 @@ while (*cc != XCL_END)
|
|
{
|
|
SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
|
|
cc++;
|
|
- if (*cc == PT_CLIST)
|
|
+ if (*cc == PT_CLIST && cc[-1] == XCL_PROP)
|
|
{
|
|
other_cases = PRIV(ucd_caseless_sets) + cc[1];
|
|
while (*other_cases != NOTACHAR)
|
|
diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c
|
|
index 8dee16e..bf94c6d 100644
|
|
--- a/src/pcre2_jit_test.c
|
|
+++ b/src/pcre2_jit_test.c
|
|
@@ -412,6 +412,7 @@ static struct regression_test_case regression_test_cases[] = {
|
|
{ MUP, A, 0, 0 | F_PROPERTY, "[\\P{L&}]{2}[^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}]{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" },
|
|
{ PCRE2_UCP, 0, 0, 0 | F_PROPERTY, "[a-b\\s]{2,5}[^a]", "AB baaa" },
|
|
{ MUP, 0, 0, 0 | F_NOMATCH, "[^\\p{Hangul}\\p{Z}]", " " },
|
|
+ { CMUP, 0, 0, 0, "[^S]\\B", "\xe2\x80\x8a" },
|
|
|
|
/* Possible empty brackets. */
|
|
{ MU, A, 0, 0, "(?:|ab||bc|a)+d", "abcxabcabd" },
|