Skip to content

match_next: validate pointer arguments and pattern reference in pcre2_next_match #1053

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
akashdeshmukh-git wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Open

match_next: validate pointer arguments and pattern reference in pcre2_next_match #1053

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
10 changes: 10 additions & 0 deletions src/pcre2_match_next.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ do_bumpalong(pcre2_match_data *match_data, PCRE2_SIZE offset)
PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
pcre2_next_match(pcre2_match_data *match_data, PCRE2_SIZE *pstart_offset, uint32_t *poptions)
{
/* Preconditions on argument values */

PCRE2_ASSERT(match_data != NULL);
PCRE2_ASSERT(pstart_offset != NULL);
PCRE2_ASSERT(poptions != NULL);

PCRE2_SIZE start_offset = match_data->start_offset;
PCRE2_SIZE *ovector = match_data->ovector;

Expand All @@ -105,6 +111,10 @@ pcre2_next_match(pcre2_match_data *match_data, PCRE2_SIZE *pstart_offset, uint32
if (match_data->rc < 0)
return FALSE;

/* Preconditions on argument state */

PCRE2_ASSERT(match_data->code != NULL);

/* Match succeeded: get the start offset for the next match */

/* Although \K can affect the position of ovector[0], there are no ways to do
Expand Down