diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-08-28 10:50:07 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-08-28 10:50:07 +0000 |
| commit | a0f6e69a6735cd767ac50c39ae646193198c9286 (patch) | |
| tree | f4d77aa8fa10944d258bcba8cc1d7adcffb02962 /pcre_exec.c | |
| parent | 69a020ebaba81397fa6166d3afdd4556218a7b28 (diff) | |
| download | pcre-a0f6e69a6735cd767ac50c39ae646193198c9286.tar.gz | |
Adjust JIT limit code; make JIT test return 1 if not successful.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@677 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_exec.c')
| -rw-r--r-- | pcre_exec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pcre_exec.c b/pcre_exec.c index 05fe0b7..0f9dcb7 100644 --- a/pcre_exec.c +++ b/pcre_exec.c @@ -5844,8 +5844,9 @@ if (extra_data != NULL && extra_data->executable_jit != NULL && (options & ~(PCRE_NO_UTF8_CHECK | PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART)) == 0) - return _pcre_jit_exec(re, extra_data->executable_jit, subject, length, - start_offset, options, offsets, offsetcount); + return _pcre_jit_exec(re, extra_data->executable_jit, subject, length, + start_offset, options, ((extra_data->flags & PCRE_EXTRA_MATCH_LIMIT) == 0) + ? MATCH_LIMIT : extra_data->match_limit, offsets, offsetcount); #endif /* Carry on with non-JIT matching. This information is for finding all the |