diff options
| author | zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-01-11 15:28:15 +0000 |
|---|---|---|
| committer | zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-01-11 15:28:15 +0000 |
| commit | 5e6a7641c60a1fcee8ae445be3511ce398c0baaa (patch) | |
| tree | 29364e0ec3afdc096ba6a80d832bf93d6f803638 /src | |
| parent | b8e06a0d98f6f985fdfdddc796e05148a8f13ba2 (diff) | |
| download | pcre2-5e6a7641c60a1fcee8ae445be3511ce398c0baaa.tar.gz | |
Fix *THEN verbs in lookahead assertions in JIT.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1204 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcre2_jit_compile.c | 3 | ||||
| -rw-r--r-- | src/pcre2_jit_test.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c index 78b94c1..00d13f1 100644 --- a/src/pcre2_jit_compile.c +++ b/src/pcre2_jit_compile.c @@ -9597,7 +9597,8 @@ if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK) } else { - OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0); + SLJIT_ASSERT(extrasize == 3); + OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(-1)); OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), bra == OP_BRAZERO ? STR_PTR : SLJIT_IMM, 0); } } diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c index e0638ef..a188724 100644 --- a/src/pcre2_jit_test.c +++ b/src/pcre2_jit_test.c @@ -860,6 +860,7 @@ static struct regression_test_case regression_test_cases[] = { { MU, A, 0, 0, "(?(?!a(*THEN)b)ad|add)", "add" }, { MU, A, 0, 0 | F_NOMATCH, "(?(?=a)a(*THEN)b|ad)", "ad" }, { MU, A, 0, 0, "(?!(?(?=a)ab|b(*THEN)d))bn|bnn", "bnn" }, + { MU, A, 0, 0, "(?=(*THEN: ))* ", " " }, /* Recurse and control verbs. */ { MU, A, 0, 0, "(a(*ACCEPT)b){0}a(?1)b", "aacaabb" }, |