summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-12-01 10:35:30 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-12-01 10:35:30 +0000
commitb12f8d8119b6ff63cfb17e0a53761a194ab7db15 (patch)
tree71e7e94be3e581ed057f03b7680c3ec41c4de161
parent130cbf55fe68014f8e7226d31d7ed9827bd1a226 (diff)
downloadpcre-b12f8d8119b6ff63cfb17e0a53761a194ab7db15.tar.gz
Fix pcretest not forgetting JIT after it has been used once.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@775 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog3
-rw-r--r--pcretest.c1
-rw-r--r--testdata/testoutput144
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fb9b9c..e05b74e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,9 @@ Version 8.21
refactoring has had the pleasing side effect of removing one argument from
the match() function, thus reducing its stack requirements.
+19. If the /S+ option was used in pcretest to study a pattern using JIT,
+ subsequent uses of /S (without +) incorrectly behaved like /S+.
+
Version 8.20 21-Oct-2011
------------------------
diff --git a/pcretest.c b/pcretest.c
index b6ab8e1..852f040 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -1632,6 +1632,7 @@ while (!done)
/* Look for options after final delimiter */
options = 0;
+ study_options = 0;
log_store = showstore; /* default from command line */
while (*pp != 0)
diff --git a/testdata/testoutput14 b/testdata/testoutput14
index 7df45cc..fa31d30 100644
--- a/testdata/testoutput14
+++ b/testdata/testoutput14
@@ -42,9 +42,7 @@ Capturing subpattern count = 0
No options
No first char
No need char
-Subject length lower bound = -1
-No set of starting bytes
-JIT study was successful
+Study returned NULL
/(?(R)a*(?1)|((?R))b)/S+
aaaabcde