Niels Dossche
341c26fc3f
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16151: Assertion failure in ext/dom/parentnode/tree.c
2024-10-01 21:47:52 +02:00
Niels Dossche
cd67c090a9
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16151: Assertion failure in ext/dom/parentnode/tree.c
2024-10-01 21:47:26 +02:00
Niels Dossche
066d18f2e8
Fix GH-16151: Assertion failure in ext/dom/parentnode/tree.c
...
Unfortunately, old DOM allows attributes to be used as parent nodes.
Only text nodes and entities are allowed as children for these types of
nodes, because that's the constraint DOM and libxml give us.
Closes GH-16156.
2024-10-01 21:46:12 +02:00
Niels Dossche
853322faab
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16149: Null pointer dereference in DOMElement->getAttributeNames()
2024-10-01 21:03:31 +02:00
Niels Dossche
63e1ebe78d
Fix GH-16149: Null pointer dereference in DOMElement->getAttributeNames()
...
A namespace without a prefix is by definition always the "xmlns"
namespace.
Closes GH-16155.
2024-10-01 21:02:23 +02:00
Niels Dossche
4a1694090b
[ci skip] Skip test under ASAN
...
We backport 1d0fb36681 to PHP-8.3.
2024-10-01 13:58:40 +02:00
Gina Peter Banyard
747860ccf0
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
NEWS entries for LDAP bug fixes
ext/ldap: Fix GH-16136 (Memory leak in php_ldap_do_modify())
ext/ldap: Fix GH-16132 (Freeing pointer not allocated by ZMM)
2024-09-30 22:24:39 +01:00
Gina Peter Banyard
10b5d4beb5
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
NEWS entries for LDAP bug fixes
ext/ldap: Fix GH-16136 (Memory leak in php_ldap_do_modify())
ext/ldap: Fix GH-16132 (Freeing pointer not allocated by ZMM)
2024-09-30 22:24:08 +01:00
Gina Peter Banyard
21260318c6
ext/ldap: Fix GH-16136 (Memory leak in php_ldap_do_modify())
2024-09-30 22:23:01 +01:00
Gina Peter Banyard
c910e78c39
ext/ldap: Fix GH-16132 (Freeing pointer not allocated by ZMM)
...
Closes GH-16134
2024-09-30 22:23:01 +01:00
Niels Dossche
bf1021c1a8
Fix typo
2024-09-30 23:05:30 +02:00
Niels Dossche
1d0fb36681
[ci skip] Skip test under ASAN
2024-09-30 22:46:05 +02:00
Niels Dossche
95d691ae00
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-15168: stack overflow in json_encode()
2024-09-30 20:43:32 +02:00
Niels Dossche
a551b99b2c
Fix GH-15168: stack overflow in json_encode()
...
The JSON encoder is recursive, and it's far from easy to make it
iterative. Add a cheap stack limit check to prevent a segfault.
This uses the PHP_JSON_ERROR_DEPTH error code that already talks about
the stack depth. Previously this was only used for the $depth argument.
Closes GH-16059.
2024-09-30 20:42:01 +02:00
David Carlier
4ad12bdd2d
Merge branch 'PHP-8.3' into PHP-8.4
2024-09-30 18:11:25 +01:00
David Carlier
d828308095
Merge branch 'PHP-8.2' into PHP-8.3
2024-09-30 18:11:14 +01:00
David Carlier
332b067c5e
Fix GH-15937: stream timeout option overflow.
...
close GH-15942
2024-09-30 18:10:33 +01:00
Tim Düsterhus
a1cc091808
reflection: Fix the return value of ReflectionFunction::{getNamespaceName,inNamespace}() for closures ( #16129 )
...
* reflection: Fix the return value of ReflectionFunction::{getNamespaceName,inNamespace}() for closures
Fixes GH-16122
* reflection: Clean up implementation of `ReflectionFunctionAbstract::inNamespace()`
* reflection: Clean up implementation of `ReflectionFunctionAbstract::getNamespaceName()`
2024-09-30 16:33:46 +02:00
Christoph M. Becker
ebee8df27e
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix potential parallel test conflicts
2024-09-29 02:13:06 +02:00
Christoph M. Becker
a17634c029
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix potential parallel test conflicts
2024-09-29 02:11:48 +02:00
Christoph M. Becker
f5649556ea
Fix potential parallel test conflicts
...
Both tests call `create_files()` with the same `$name_prefix` what
might clash.
Co-authored-by: Gina Peter Banyard <girgias@php.net >
Closes GH-16103.
2024-09-29 02:05:14 +02:00
Máté Kocsis
f4f2fe51cd
Fix property_exists() and unset() for XMLReader ( #16079 )
2024-09-28 21:08:47 +02:00
Gina Peter Banyard
16b272da14
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
ext/ldap: Fix GH-16101 (Segfaults in php_ldap_do_search() when LDAPs is not a list)
2024-09-28 19:54:40 +01:00
Gina Peter Banyard
0f2fe67b2a
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
ext/ldap: Fix GH-16101 (Segfaults in php_ldap_do_search() when LDAPs is not a list)
2024-09-28 19:54:06 +01:00
Gina Peter Banyard
19bba83715
ext/ldap: Fix GH-16101 (Segfaults in php_ldap_do_search() when LDAPs is not a list)
...
Closes GH-16102
2024-09-28 19:52:47 +01:00
Jakub Zelenka
e05121563f
Merge branch 'PHP-8.3' into PHP-8.4
2024-09-28 16:29:18 +01:00
Jakub Zelenka
37a73a83c3
Merge branch 'PHP-8.2' into PHP-8.3
2024-09-28 16:24:01 +01:00
Jakub Zelenka
dce0d97640
Fix stub for openssl_csr_new
2024-09-28 16:22:08 +01:00
Niels Dossche
b21d2ca93b
Fix bogus fallthrough path in firebird_handle_get_attribute(), again
...
This reapplies b8e9c5ba6a after it was accidentally removed via
225034dbbc .
2024-09-28 13:19:33 +02:00
Christoph M. Becker
e014b5f506
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix failing soap tests on Windows
2024-09-27 19:59:30 +02:00
Christoph M. Becker
6556e59865
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix failing soap tests on Windows
2024-09-27 19:58:30 +02:00
Christoph M. Becker
9f63657765
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix failing soap tests on Windows
2024-09-27 19:57:47 +02:00
Christoph M. Becker
5f3e6e346c
Fix failing soap tests on Windows
...
These failures are caused by the fix for GHSA-p99j-rfp4-xqvq. Since
the two bug*.phpt tests don't need the "wsdl" query string, and don't
even need php-cgi, we just remove the `--GET--` section. The two
server*.phpt tests are harder to fix, since during evaluation of the
`--SKIPIF--` section, the soap extension can be loaded, but it may not
during evaluation of the `--FILE--` section. So for now, we skip these
tests on Windows altogether.
Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com >
Closes GH-16084.
2024-09-27 19:56:19 +02:00
Ilija Tovilo
28d88c72bc
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Reduce regex backtracking in phpinfo.phpt
2024-09-27 17:10:58 +02:00
Ilija Tovilo
0226e5d01d
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Reduce regex backtracking in phpinfo.phpt
2024-09-27 17:10:47 +02:00
Ilija Tovilo
c4c45da4b9
Reduce regex backtracking in phpinfo.phpt
...
On NixOS, the output of phpinfo() can get very large, causing us to run into the
backtracking limit. Lazy matching for .*/.+ can help reduce backtracking.
2024-09-27 15:02:21 +02:00
Dmitry Stogov
a37a3d3d81
Fix FFI prototypes (these functions can't return NULL) ( #16075 )
2024-09-26 20:19:46 +03:00
Ilija Tovilo
c7bc91cfcd
[skip ci] Mark one more curl test as xleak
2024-09-26 16:50:06 +02:00
Ilija Tovilo
b14d440a82
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Switch asan build to Ubuntu 24.04
2024-09-26 15:15:39 +02:00
Ilija Tovilo
91c06790de
Switch asan build to Ubuntu 24.04
...
Closes GH-16065
2024-09-26 15:13:35 +02:00
Dmitry Stogov
b8ac4ca19d
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix possible NULL dereference
2024-09-26 15:44:16 +03:00
Dmitry Stogov
8b7f64fa41
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix possible NULL dereference
2024-09-26 15:44:05 +03:00
Dmitry Stogov
24d5912a30
Fix possible NULL dereference
2024-09-26 15:43:42 +03:00
Christoph M. Becker
d6b8ef81d7
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix bug71610.phpt
2024-09-26 13:18:52 +02:00
Christoph M. Becker
70eb8f06ed
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix bug71610.phpt
2024-09-26 13:16:36 +02:00
Christoph M. Becker
de51612ba5
Fix bug71610.phpt
...
Apparently example.org now rejects POST requests, so we would need to
adjust the test expectation ("Method not allowed"). However, there is
no need for an online test; instead we're just using the CLI test
server. The serialization is a bit fiddly, but as long as there are
no quotes in `PHP_CLI_SERVER_ADDRESS` we're fine.
Closes GH-16063.
2024-09-26 13:16:00 +02:00
Remi Collet
a1cacec067
zip extension is 1.22.4
2024-09-26 09:39:10 +02:00
Gina Peter Banyard
18f61ad47d
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
ext/ldap: Fix GH-16032 (Various NULL pointer dereferencements in ldap_modify_batch())
2024-09-25 23:27:12 +01:00
Gina Peter Banyard
459486a7db
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
ext/ldap: Fix GH-16032 (Various NULL pointer dereferencements in ldap_modify_batch())
2024-09-25 23:26:31 +01:00
Gina Peter Banyard
f4c45ee376
ext/ldap: Fix GH-16032 (Various NULL pointer dereferencements in ldap_modify_batch())
...
We check that the "attrib" and "modtype" keys are present in each array.
If not we throw a ValueError, in line with what other validation failure cases do.
Closes GH-16057
2024-09-25 23:23:56 +01:00