Skip to content

[pull] master from php:master#1040

Merged
pull[bot] merged 6 commits into
turkdevops:masterfrom
php:master
Jun 27, 2026
Merged

[pull] master from php:master#1040
pull[bot] merged 6 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jun 27, 2026

Copy link
Copy Markdown

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 : )

LamentXU123 and others added 6 commits June 27, 2026 23:01
…t_max_size values

998bce0 is accidentally pushed directly to master as this should go to a PR branch.

This commit revert that.
The HAVE_LIBINTL macro is defined only when the ext/gettext is enabled
during the build. Also, LC_MESSAGES have been moved to other places
since this header was initially included.
spl_recursive_it_move_forward_ex() tears down the exhausted level after
running its sub-iterator, but endChildren() and a sub-iterator's valid()
can re-enter through $this->next() and tear that level down first. The
no-more-elements branch then dtored a stale iterator pointer, and valid()
kept running on a sub-iterator the reentrant call had already freed.
Guard the teardown on the level's iterator being unchanged, and hold a
reference on the sub-iterator across valid().

Closes GH-22478
* PHP-8.4:
  Fix use-after-free in RecursiveIteratorIterator on reentrant teardown
* PHP-8.5:
  Fix use-after-free in RecursiveIteratorIterator on reentrant teardown
@pull pull Bot locked and limited conversation to collaborators Jun 27, 2026
@pull pull Bot added the ⤵️ pull label Jun 27, 2026
@pull pull Bot merged commit 8b39b01 into turkdevops:master Jun 27, 2026
0 of 2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants