Skip to content

fuzz: forbid usage of pcre with \X backport7 #15689

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

Closed
catenacyber wants to merge 1 commit into from
Closed

fuzz: forbid usage of pcre with \X backport7 #15689

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
15 changes: 15 additions & 0 deletions src/detect-pcre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,21 @@ static DetectPcreData *DetectPcreParse (DetectEngineCtx *de_ctx,
if (capture_names == NULL || strlen(capture_names) == 0)
opts |= PCRE2_NO_AUTO_CAPTURE;

#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
// forbid use of \X Unicode extended grapheme cluster as slow
bool escape = false;
for (size_t i = 0; i < strlen(re); i++) {
if (escape) {
if (re[i] == 'X') {
goto error;
}
escape = false;
} else if (re[i] == '\\') {
escape = true;
}
}

#endif
pd->parse_regex.regex =
pcre2_compile((PCRE2_SPTR8)re, PCRE2_ZERO_TERMINATED, opts, &en, &eo2, NULL);
if (pd->parse_regex.regex == NULL && en == 115) { // reference to nonexistent subpattern
Expand Down
Loading