Skip to content

oss-fuzz: remove callout_count #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carenas wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −18
Open

oss-fuzz: remove callout_count #882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions src/pcre2_fuzzsupport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,6 @@ abort();
#endif /* SUPPORT_DIFF_FUZZ */
#endif /* SUPPORT_JIT */

/* This is the callout function. Its only purpose is to halt matching if there
are more than 100 callouts, as one way of stopping too much time being spent on
fruitless matches. The callout data is a pointer to the counter. */

static int callout_function(pcre2_callout_block *cb, void *callout_data)
{
(void)cb; /* Avoid unused parameter warning */
*((uint32_t *)callout_data) += 1;
return (*((uint32_t *)callout_data) > 100)? PCRE2_ERROR_CALLOUT : 0;
}

/* Putting in this apparently unnecessary prototype prevents gcc from giving a
"no previous prototype" warning when compiling at high warning level. */

Expand Down Expand Up @@ -492,7 +481,6 @@ likewise do the match with and without the options. */

for (int i = 0; i < 2; i++)
{
uint32_t callout_count;
int errorcode;
#ifdef SUPPORT_JIT
int errorcode_jit;
Expand Down Expand Up @@ -576,7 +564,6 @@ for (int i = 0; i < 2; i++)
}
(void)pcre2_set_match_limit(match_context, 100);
(void)pcre2_set_depth_limit(match_context, 100);
(void)pcre2_set_callout(match_context, callout_function, &callout_count);
}

/* Match twice, with and without options. */
Expand All @@ -590,7 +577,6 @@ for (int i = 0; i < 2; i++)
print_match_options(stdout, match_options);
#endif

callout_count = 0;
errorcode = pcre2_match(code, (PCRE2_SPTR)wdata, (PCRE2_SIZE)match_size, 0,
match_options, match_data, match_context);

Expand All @@ -608,7 +594,6 @@ with the interpreter. */
#ifdef STANDALONE
printf("Matching with JIT\n");
#endif
callout_count = 0;
errorcode_jit = pcre2_match(code, (PCRE2_SPTR)wdata, (PCRE2_SIZE)match_size, 0,
match_options & ~PCRE2_NO_JIT, match_data_jit, match_context);

Expand All @@ -631,8 +616,9 @@ with the interpreter. */
if (errorcode_jit != errorcode)
{
if (!(errorcode < 0 && errorcode_jit < 0) &&
errorcode != PCRE2_ERROR_MATCHLIMIT && errorcode != PCRE2_ERROR_CALLOUT &&
errorcode_jit != PCRE2_ERROR_MATCHLIMIT && errorcode_jit != PCRE2_ERROR_JIT_STACKLIMIT && errorcode_jit != PCRE2_ERROR_CALLOUT)
errorcode != PCRE2_ERROR_MATCHLIMIT &&
errorcode_jit != PCRE2_ERROR_MATCHLIMIT &&
errorcode_jit != PCRE2_ERROR_JIT_STACKLIMIT)
{
describe_failure("match errorcode comparison", wdata, size, compile_options, match_options, errorcode, errorcode_jit, matches, matches_jit, match_data, match_data_jit);
}
Expand Down Expand Up @@ -711,7 +697,6 @@ with the interpreter. */
((match_options & PCRE2_PARTIAL_SOFT) != 0)? " partial_soft" : "");
#endif

callout_count = 0;
errorcode = pcre2_dfa_match(code, (PCRE2_SPTR)wdata,
(PCRE2_SIZE)match_size, 0, match_options, match_data,
match_context, dfa_workspace, DFA_WORKSPACE_COUNT);
Expand Down