Fix #5189: Restore pregMatch capture group extraction on PCRE2 - #5191
Merged
FileEX merged 2 commits intoAug 17, 2026
Conversation
FileEX
approved these changes
Aug 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix
pregMatchregression where patterns with capturing groups return the full match instead of the first captured subpattern.Motivation
FindAndConsumeinShared/pcrecpp_compat.hwas readingovector[0..1](full match) instead ofovector[2..3](capture group 1). This was introduced in PR #4939 during the PCRE1 → PCRE2 migration and broke all scripts relying on capture group extraction.Fixes #5189.
The fix caches the capture group count at compile time via
pcre2_pattern_info(PCRE2_INFO_CAPTURECOUNT)and selects the correct ovector range inFindAndConsume:Forward progress on zero-width matches is preserved by always consuming based on the full match end offset.
Test plan
pcre_test.zip
Results
PCRE2 & PREG Functions Test Results — 21/21 Passed
Checklist