Skip to content

[pull] master from php:master#1048

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

[pull] master from php:master#1048
pull[bot] merged 13 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jun 30, 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 : )

TimWolla and others added 13 commits June 30, 2026 00:39
* lexbor: Clean existing patches in `update-lexbor.sh`

The filename of the patch file is derived from the commit message. When the
commit message changes or the patch was initially added with the wrong name the
patch file might be renamed and exist twice when it's not deleted.

* lexbor: Drop patch signature in `update-lexbor.sh`

This includes the git version number by default which makes the patches
unstable.

* lexbor: Zero the commit hash in generated patches in `update-lexbor.sh`

Including the commit ID of the temporary commit in the patch files makes them
unstable.

* lexbor: Run `update_lexbor.sh`
* PHP-8.4:
  lexbor: Refresh patch files (#22517)
….patch

This prevented the patch from applying cleanly when running `./update_lexbor.sh`.
* PHP-8.5:
  lexbor: Run `update_lexbor.sh` (PHP 8.5)
  lexbor: Refresh patch files (#22517)
* PHP-8.5:
  Merge Lexbor patch c3a68477399d446660ac241d3a55357dc95c6e81
* PHP-8.2:
  ext/openssl: openssl_encrypt() zend mm heap overflow on AES-WRAP-PAD mode.
* PHP-8.3:
  ext/openssl: openssl_encrypt() zend mm heap overflow on AES-WRAP-PAD mode.
* PHP-8.4:
  ext/openssl: openssl_encrypt() zend mm heap overflow on AES-WRAP-PAD mode.
* PHP-8.5:
  ext/openssl: openssl_encrypt() zend mm heap overflow on AES-WRAP-PAD mode.
…1369)

FETCH_OBJ_FUNC_ARG reading a SIMPLE_GET property hook pushed the getter
call frame mid-trace and corrupted the call being built, crashing at the
following SEND_FUNC_ARG. Compile it inline like FETCH_OBJ_R, clearing the
SIMPLE_GET flag so the read takes read_property. Arguments to a known
callee resolve their by-ref-ness at compile time through the preceding
CHECK_FUNC_ARG; named arguments and arguments to an unknown callee (e.g.
a __call trampoline) get a run-time guard that deoptimizes to the
interpreter when the argument is passed by reference.

Fixes GH-21006
@pull pull Bot locked and limited conversation to collaborators Jun 30, 2026
@pull pull Bot added the ⤵️ pull label Jun 30, 2026
@pull pull Bot merged commit ae00731 into turkdevops:master Jun 30, 2026
1 of 3 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.

4 participants