Merge branch 'PHP-8.4'

* PHP-8.4:
Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure

Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure

The success path frees tmp_str, but the error path does not.

Closes GH-17243.

SplFileObject::fwrite $length param nullable (#17242)

Merge branch 'PHP-8.4'

* PHP-8.4:
Include relevant system headers before defining fallbacks

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Include relevant system headers before defining fallbacks

Include relevant system headers before defining fallbacks

Otherwise we may define the fallbacks, and later inclusion of the
system headers may attempt to redefine those.

Fixes G

Include relevant system headers before defining fallbacks

Otherwise we may define the fallbacks, and later inclusion of the
system headers may attempt to redefine those.

Fixes GH-17112.
Closes GH-17129.

show more ...

Merge branch 'PHP-8.4'

Merge branch 'PHP-8.3' into PHP-8.4

Introduce FPM_TEST_DEBUG_FILTER env var and extend multi request tracing

Implement cache slot optimization for XMLReader (#17232)

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix DOM test on higher branches

Fix DOM test on higher branches

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17225: NULL deref in spl_directory.c

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17225: NULL deref in spl_directory.c

Fix GH-17225: NULL deref in spl_directory.c

NULL checks for the glob stream are inconsistently applied. To solve
this generally, factor it out to a helper function so it's less likely

Fix GH-17225: NULL deref in spl_directory.c

NULL checks for the glob stream are inconsistently applied. To solve
this generally, factor it out to a helper function so it's less likely
to be forgotten in the future.

Closes GH-17231.

show more ...

ext/pdo_firebird: Fix label follow by declaration (#17229)

A label should be followed by a statement and not a declaration, else old gcc gives the following error: a label can only be part o

ext/pdo_firebird: Fix label follow by declaration (#17229)

A label should be followed by a statement and not a declaration, else old gcc gives the following error: a label can only be part of a statement and a declaration is not a statement

To fix this we wrap the code in the switch case block in braces.

show more ...

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17224: UAF in importNode

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17224: UAF in importNode

Fix GH-17224: UAF in importNode

Wrong document pointer is used for the namespace copy.

Closes GH-17230.

Merge branch 'PHP-8.4'

* PHP-8.4:
Fix GH-17216: Trampoline crash on error

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
Fix GH-17216: Trampoline crash on error

Fix GH-17216: Trampoline crash on error

The error handling is incomplete on argument cleanup.
1. The fci is not cleared which means that zend_free_trampoline() is
never called.

Fix GH-17216: Trampoline crash on error

The error handling is incomplete on argument cleanup.
1. The fci is not cleared which means that zend_free_trampoline() is
never called.
2. The cleaning for extra named arguments was missing, resulting in
memory leak.

Closes GH-17219.

show more ...

ext/sockets: further timeout handling changes. (#17210)

close GH-17210

Merge branch 'PHP-8.4'

* PHP-8.4:
Add observer temporary to dl'ed functions