Repository navigation
Conversation
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.
The PHP-8.6 into master merge (9705fda) dropped the
buf->out/buf->limitsync from the failure path ofmb_convert_buf_ensure(), along with its test. So when a second buffer growth fails,buf->outstill points into the old, freed buffer, andmb_convert_buf_result()writes through it and computes a bogus length. With the tracked allocator this trips theend >= passertion inzend_memnstr()frommb_substr_count(). This puts the three lines back and restoresoom_buf_growth.phptfrom PHP-8.6, so the mbstring libmbfl code matches PHP-8.6 again.Fixes GH-24489