<regex>: Correctly set up match_results for match attempts on default-constructed regexes#6185
Merged
StephanTLavavej merged 1 commit intomicrosoft:mainfrom Mar 27, 2026
Conversation
…n default-constructed regexes
StephanTLavavej
added
bug
StephanTLavavej
approved these changes
Mar 26, 2026
Comment on lines
+4854
to
+4856
| _Matches._Pfx().second = _Matches._At(0).first; | ||
|
|
||
| _Matches._Sfx().first = _Matches._At(0).second; |
Member
There was a problem hiding this comment.
Pre-existing, no change requested: I believe that _Matches._At(0) could be replaced with _Submatch0.
Member
|
I'm mirroring this to the MSVC-internal repo. Please notify me if any further changes are pushed, otherwise no action is required. |
Member
|
Thanks for noticing and fixing this bug, Regex Lord! 👑 🕵️ 😻 |
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
2 participants
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.
Fixes #6181.
This PR moves the code to manipulate the
match_resultsout of the_Matcher3::_Matchfunction.The code resetting the
match_resultsbecomes the first step in_Regex_match1and_Regex_search2, thus ensuring that they are set up correctly for the early return when these functions are called on default-constructed regexes.The code filling the
match_resultsis moved into a new function_Matcher3::_Copy_captures. This function is called by_Regex_match1and_Regex_search2now after finding a successful match.The changes in this PR and #6164 mean that
_Matcher3no longer depends on the (potentially wrapped) iterator type_BidItexcept for the code in_Matcher3::_Copy_captures, so we can remove the type as a template parameter from the class and only template this specific member function on it. This also exposed one place in_Matcher3::_Skipwhere I accidentally failed to clean up some wrong_BidItusage in #6164.