ext/pcre: fix duplicate MARK key in matches array#22029
Open
iliaal wants to merge 1 commit into
Open
Conversation
When a named capture group is also called "MARK" and the pattern uses the (*MARK:name) directive, populate_subpat_array() inserted two buckets with the same string key into the matches array. zend_hash_str_add_new skips the duplicate-key check, so the named capture's MARK and the directive's MARK both landed in the table. Switch to zend_hash_str_update so the directive's value overwrites the capture's value, restoring the behavior that existed via add_assoc_string_ex before d6cc31c.
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
1 participant
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.
Regression from d6cc31c: populate_subpat_array() now uses zend_hash_str_add_new for the (*MARK:name) directive, which skips the duplicate-key check. When a named capture is also called MARK, two buckets land in $matches.
Repro:
preg_match('/(?P<MARK>[abc])(*MARK:value)/', "abc", $m);. Master gives count($m)==4 with a duplicate JSON key; PHP-8.4 gives 3. Restore the directive-overwrites-capture behavior that add_assoc_string_ex provided before the refactor.