[pull] master from php:master#822
Merged
pull[bot] merged 10 commits intoturkdevops:masterfrom Mar 28, 2026
Merged
Conversation
This function is only called within dfa_pass.c, thus make it static Return a uint32_t as the value can never be negative Add some const qualifiers
…construction (#21564) * ext/spl: zend_string_concat3() instead of manual memcpy for sub_path construction * spl: Adjust `zend_string_concat3()` formatting --------- Co-authored-by: Tim Düsterhus <tim@bastelstu.be>
Wrap bailable sections in php_iconv_string(), _php_iconv_substr(), _php_iconv_mime_encode(), and _php_iconv_mime_decode() with zend_try/zend_catch to ensure iconv handles allocated via system malloc are closed if a Zend OOM bailout fires during smart_str or zend_string operations. Fixes GH-17399 Closes GH-21541
* PHP-8.4: Fix GH-17399: iconv memory leak on bailout
* PHP-8.5: Fix GH-17399: iconv memory leak on bailout
* PHP-8.4: [skip ci] Mark gh17399_substr.phpt as slow
* PHP-8.5: [skip ci] Mark gh17399_substr.phpt as slow
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )