walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Next attempt to fix the previous bug.

This commit is contained in:
Zoltán Herczeg 2014-11-30 10:05:41 +00:00
parent d788c58e6b
commit bb3b7927f3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pcre2_jit_match.c
View File

@ -139,6 +139,10 @@ if (mcontext != NULL)
arguments.callout_data = mcontext->callout_data; arguments.callout_data = mcontext->callout_data;
arguments.limit_match = (mcontext->match_limit < re->limit_match)? arguments.limit_match = (mcontext->match_limit < re->limit_match)?
mcontext->match_limit : re->limit_match; mcontext->match_limit : re->limit_match;
if (mcontext->jit_callback != NULL)
jit_stack = mcontext->jit_callback(mcontext->jit_callback_data);
else
jit_stack = (pcre2_jit_stack *)mcontext->jit_callback_data;
} }
else else
{ {
@ -146,6 +150,7 @@ else
arguments.callout_data = NULL; arguments.callout_data = NULL;
arguments.limit_match = (MATCH_LIMIT < re->limit_match)? arguments.limit_match = (MATCH_LIMIT < re->limit_match)?
MATCH_LIMIT : re->limit_match; MATCH_LIMIT : re->limit_match;
jit_stack = NULL;
} }
/* JIT only need two offsets for each ovector entry. Hence /* JIT only need two offsets for each ovector entry. Hence
@ -156,10 +161,6 @@ if (oveccount > max_oveccount)
oveccount = max_oveccount; oveccount = max_oveccount;
arguments.oveccount = oveccount << 1; arguments.oveccount = oveccount << 1;
if (mcontext && mcontext->jit_callback != NULL)
jit_stack = mcontext->jit_callback(mcontext->jit_callback_data);
else
jit_stack = (pcre2_jit_stack *)mcontext->jit_callback_data;
convert_executable_func.executable_func = functions->executable_funcs[index]; convert_executable_func.executable_func = functions->executable_funcs[index];
if (jit_stack != NULL) if (jit_stack != NULL)