ext/pcre: fix memory leaks on error paths#21298
Closed
devnexen wants to merge 1 commit intophp:PHP-8.4from
Closed
Conversation
ndossche
approved these changes
Feb 26, 2026
| } | ||
|
|
||
| rc = pcre2_pattern_info(re, PCRE2_INFO_NAMECOUNT, &new_entry.name_count); | ||
| if (rc < 0) { |
Member
There was a problem hiding this comment.
As a follow-up, would be nice if the this error-handling code branch and the previous one are somehow merged: they are identical.
ext/pcre/php_pcre.c
Outdated
| if (UNEXPECTED(offsets[1] < offsets[0])) { | ||
| if (match_sets) efree(match_sets); | ||
| if (match_sets) { | ||
| for(i = 0; i < num_subpats; i++) { |
Member
There was a problem hiding this comment.
nit:
Suggested change
| for(i = 0; i < num_subpats; i++) { | |
| for (i = 0; i < num_subpats; i++) { |
Fix pcre2_code leak when pcre2_pattern_info() fails after a successful pcre2_compile(), and fix match_sets/match_data/marks leak when offsets[1] < offsets[0] in php_pcre_match_impl().
5cb744b to
713f662
Compare
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.
Fix pcre2_code leak when pcre2_pattern_info() fails after a successful pcre2_compile(), and fix match_sets/match_data/marks leak when offsets[1] < offsets[0] in php_pcre_match_impl().