summaryrefslogtreecommitdiff
path: root/pcre_dfa_exec.c
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-10-10 16:01:03 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2011-10-10 16:01:03 +0000
commitadb2ce0ceb33f09fe256ab3b78d61440f9e3ec24 (patch)
tree6af5311ce6960d759cff27a90b54d04883a7c926 /pcre_dfa_exec.c
parentb836a145bfd1a79b410286751b59bffb15acf357 (diff)
downloadpcre-adb2ce0ceb33f09fe256ab3b78d61440f9e3ec24.tar.gz
PCRE_NO_START_OPTIMIZE, if given to pcre_compile(), did not suppress the
subject length check at run time. git-svn-id: svn://vcs.exim.org/pcre/code/trunk@728 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_dfa_exec.c')
-rw-r--r--pcre_dfa_exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pcre_dfa_exec.c b/pcre_dfa_exec.c
index 62d03c5..96f198c 100644
--- a/pcre_dfa_exec.c
+++ b/pcre_dfa_exec.c
@@ -3330,7 +3330,7 @@ for (;;)
disabling is explicitly requested (and of course, by the test above, this
code is not obeyed when restarting after a partial match). */
- if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
+ if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0 &&
(options & (PCRE_PARTIAL_HARD|PCRE_PARTIAL_SOFT)) == 0)
{
/* If the pattern was studied, a minimum subject length may be set. This