ext/mbstring: mb_ereg*_replace fix leak on failed callback.#18646
Merged
devnexen merged 2 commits intophp:masterfrom May 25, 2025
Merged
ext/mbstring: mb_ereg*_replace fix leak on failed callback.#18646devnexen merged 2 commits intophp:masterfrom
devnexen merged 2 commits intophp:masterfrom
Conversation
ndossche
reviewed
May 24, 2025
ext/mbstring/php_mbregex.c
Outdated
| @@ -1109,6 +1109,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp | |||
| } else { | |||
| if (!EG(exception)) { | |||
Member
There was a problem hiding this comment.
I believe this code is even unreachable. zend_call_function only returns FAILURE when !EG(active), which should not be possible to hit from here. And retval is only UNDEF if an exception did happen.
Member
There was a problem hiding this comment.
After double checking I think I'm right. You can drop this else branch in master.
devnexen
force-pushed
the
onig_free_my_region
branch
from
c8028af to
d84273a
Compare
devnexen
requested review from
TimWolla,
arnaud-lb,
dstogov and
kocsismate
as code owners
ndossche
approved these changes
May 25, 2025
Girgias
reviewed
May 26, 2025
| @@ -1106,12 +1106,6 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp | |||
| smart_str_appendl(&out_buf, Z_STRVAL(retval), Z_STRLEN(retval)); | |||
Member
There was a problem hiding this comment.
Just noticing this, but this could just be smart_str_append()
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
3 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.
No description provided.