diff options
| author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2017-03-12 13:47:01 +0000 |
|---|---|---|
| committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2017-03-12 13:47:01 +0000 |
| commit | 4dc316b04f2ff86d26cebca81c624330f4af6361 (patch) | |
| tree | e0b777b342b7a0e1711c58dbce3ecb568fe6c211 /src/pcre2_match.c | |
| parent | 47f31dcbb0aa3ae83c097b7a439fb74b3fa994bb (diff) | |
| download | pcre2-4dc316b04f2ff86d26cebca81c624330f4af6361.tar.gz | |
Change "limit recursion" to "limit depth" in code and build systems because the
old name, which is retained as a synonym for the moment, is no longer
appropriate.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@678 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2_match.c')
| -rw-r--r-- | src/pcre2_match.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pcre2_match.c b/src/pcre2_match.c index 7667e1d..3b57629 100644 --- a/src/pcre2_match.c +++ b/src/pcre2_match.c @@ -548,7 +548,7 @@ Returns: MATCH_MATCH if matched ) these values are >= 0 MATCH_NOMATCH if failed to match ) negative MATCH_xxx value for PRUNE, SKIP, etc negative PCRE2_ERROR_xxx value if aborted by an error condition - (e.g. stopped by repeated call or recursion limit) + (e.g. stopped by repeated call or depth limit) */ static int @@ -708,7 +708,7 @@ recursive depth limit (used too many backtracking frames). If not, process the opcodes. */ if (mb->match_call_count++ >= mb->match_limit) return PCRE2_ERROR_MATCHLIMIT; -if (Frdepth >= mb->match_limit_recursion) return PCRE2_ERROR_RECURSIONLIMIT; +if (Frdepth >= mb->match_limit_depth) return PCRE2_ERROR_DEPTHLIMIT; for (;;) { @@ -6272,9 +6272,9 @@ memset((char *)(mb->match_frames) + offsetof(heapframe, ovector), 0xff, smaller. */ mb->match_limit = (mcontext->match_limit < re->limit_match)? - mcontext->match_limit : re->limit_match; -mb->match_limit_recursion = (mcontext->recursion_limit < re->limit_recursion)? - mcontext->recursion_limit : re->limit_recursion; + mcontext->match_limit : re->limit_match; +mb->match_limit_depth = (mcontext->depth_limit < re->limit_depth)? + mcontext->depth_limit : re->limit_depth; /* Pointers to the individual character tables */ |