diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-11-08 09:59:38 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-11-08 09:59:38 +0000 |
| commit | 0cba29be59c8ca542c0982fa506d813970cdb84f (patch) | |
| tree | c34a204b9c84569b2eeee6bbe8544dea4614823d | |
| parent | e2844b5f0b343a7ee7dbe79beb23b14a625ef755 (diff) | |
| download | pcre-0cba29be59c8ca542c0982fa506d813970cdb84f.tar.gz | |
Marks in non-capturing atomic groups were not being passed out.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@743 2f5784b3-3f2a-0410-8824-cb99058d5e15
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pcre_exec.c | 1 | ||||
| -rw-r--r-- | testdata/testinput11 | 6 | ||||
| -rw-r--r-- | testdata/testoutput11 | 11 |
4 files changed, 22 insertions, 0 deletions
@@ -12,6 +12,10 @@ Version 8.21 3. Fix cache-flush issue on PowerPC (It is still an experimental JIT port). PCRE_EXTRA_TABLES is not suported by JIT, and should be checked before calling _pcre_jit_exec. Some extra comments are added. + +4. Mark settings inside atomic groups that do not contain any capturing + parentheses, for example, (?>a(*:m)), were not being passed out. This bug + was introduced by change 18 for 8.20. Version 8.20 21-Oct-2011 diff --git a/pcre_exec.c b/pcre_exec.c index 2e763d1..49189fb 100644 --- a/pcre_exec.c +++ b/pcre_exec.c @@ -816,6 +816,7 @@ for (;;) if (rrc == MATCH_MATCH) /* Note: _not_ MATCH_ACCEPT */ { mstart = md->start_match_ptr; + markptr = md->mark; break; } if (rrc == MATCH_THEN) diff --git a/testdata/testinput11 b/testdata/testinput11 index 198dbf2..5849eb0 100644 --- a/testdata/testinput11 +++ b/testdata/testinput11 @@ -767,4 +767,10 @@ name)/K /------------------------------/ +/(?>a(*:m))/imsxSK + a + +/(?>(a)(*:m))/imsxSK + a + /-- End of testinput11 --/ diff --git a/testdata/testoutput11 b/testdata/testoutput11 index 4af2e92..e3df0eb 100644 --- a/testdata/testoutput11 +++ b/testdata/testoutput11 @@ -1389,4 +1389,15 @@ No match /------------------------------/ +/(?>a(*:m))/imsxSK + a + 0: a +MK: m + +/(?>(a)(*:m))/imsxSK + a + 0: a + 1: a +MK: m + /-- End of testinput11 --/ |