Skip to content

Check match error before nametable scan in substring byname functions #1052

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 3 commits into
base: main
Choose a base branch
from
Open

Check match error before nametable scan in substring byname functions #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a14087b
Check match error before nametable scan in substring byname functions
akashdeshmukh-git Oct 23, 2026
f7ec661
Normalize line endings to LF in pcre2_substring.c and pcre2test_inc.h
akashdeshmukh-git Oct 24, 2026
38321c5
Assert match_data->code is set instead of returning an error
akashdeshmukh-git Oct 24, 2026
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: 21 additions & 0 deletions src/pcre2_substring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ pcre2_substring_copy_byname(pcre2_match_data *match_data, PCRE2_SPTR stringname,
if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
return PCRE2_ERROR_DFA_UFUNC;

if (match_data->rc < 0)
return match_data->rc;

/* Preconditions on argument state */

PCRE2_ASSERT(match_data->code != NULL);

PCRE2_SPTR first, last;
int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname, &first, &last);
if (entrysize < 0)
Expand Down Expand Up @@ -185,6 +192,13 @@ pcre2_substring_get_byname(pcre2_match_data *match_data, PCRE2_SPTR stringname,
if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
return PCRE2_ERROR_DFA_UFUNC;

if (match_data->rc < 0)
return match_data->rc;

/* Preconditions on argument state */

PCRE2_ASSERT(match_data->code != NULL);

PCRE2_SPTR first, last;
int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname, &first, &last);
if (entrysize < 0)
Expand Down Expand Up @@ -316,6 +330,13 @@ pcre2_substring_length_byname(pcre2_match_data *match_data, PCRE2_SPTR stringnam
if (match_data->matchedby == PCRE2_MATCHEDBY_DFA_INTERPRETER)
return PCRE2_ERROR_DFA_UFUNC;

if (match_data->rc < 0)
return match_data->rc;

/* Preconditions on argument state */

PCRE2_ASSERT(match_data->code != NULL);

PCRE2_SPTR first, last;
int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname, &first, &last);
if (entrysize < 0)
Expand Down
17 changes: 17 additions & 0 deletions src/pcre2test_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7108,6 +7108,23 @@ unittest(void)
rc = pcre2_substring_get_bynumber(test_match_data, 1, &sptrval, &sizeval);
ASSERT(rc == PCRE2_ERROR_NOMATCH && sptrval == NULL, "pcre2_substring_get_bynumber(no match)");

/* Test after an early match failure where match_data->code was not set. */

pcre2_match_data_free(test_match_data);
test_match_data = pcre2_match_data_create(10, NULL);
ASSERT(test_match_data != NULL, "pcre2_match_data_create(early failure)");

rc = pcre2_match(test_compiled_code, subject_abcz, 4, 10, 0, test_match_data, NULL);
ASSERT(rc == PCRE2_ERROR_BADOFFSET, "pcre2_match(badoffset)");

sizeval = 4;
rc = pcre2_substring_copy_byname(test_match_data, name_n, copy_buf, &sizeval);
ASSERT(rc == PCRE2_ERROR_BADOFFSET, "pcre2_substring_copy_byname(early failure)");
rc = pcre2_substring_get_byname(test_match_data, name_n, &sptrval, &sizeval);
ASSERT(rc == PCRE2_ERROR_BADOFFSET && sptrval == NULL, "pcre2_substring_get_byname(early failure)");
rc = pcre2_substring_length_byname(test_match_data, name_n, &sizeval);
ASSERT(rc == PCRE2_ERROR_BADOFFSET, "pcre2_substring_length_byname(early failure)");

/* ------------- pcre2_substitute with PCRE2_SUBSTITUTE_MATCHED ------------ */

/* There are some specific edge cases here that would be a pain to exercise via
Expand Down