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_dfa_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_dfa_match.c')
-rw-r--r-- | src/pcre2_dfa_match.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pcre2_dfa_match.c b/src/pcre2_dfa_match.c index 471e159..72c6f18 100644 --- a/src/pcre2_dfa_match.c +++ b/src/pcre2_dfa_match.c @@ -400,7 +400,7 @@ BOOL utf = FALSE; BOOL reset_could_continue = FALSE; -if (rlevel++ > mb->match_limit_recursion) return PCRE2_ERROR_RECURSIONLIMIT; +if (rlevel++ > mb->match_limit_depth) return PCRE2_ERROR_DEPTHLIMIT; offsetcount &= (uint32_t)(-2); /* Round down */ wscount -= 2; @@ -3215,7 +3215,7 @@ if (mcontext == NULL) { mb->callout = NULL; mb->memctl = re->memctl; - mb->match_limit_recursion = PRIV(default_match_context).recursion_limit; + mb->match_limit_depth = PRIV(default_match_context).depth_limit; } else { @@ -3228,10 +3228,10 @@ else mb->callout = mcontext->callout; mb->callout_data = mcontext->callout_data; mb->memctl = mcontext->memctl; - mb->match_limit_recursion = mcontext->recursion_limit; + mb->match_limit_depth = mcontext->depth_limit; } -if (mb->match_limit_recursion > re->limit_recursion) - mb->match_limit_recursion = re->limit_recursion; +if (mb->match_limit_depth > re->limit_depth) + mb->match_limit_depth = re->limit_depth; mb->start_code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) + re->name_count * re->name_entry_size; |