Niels Dossche
51e0920e45
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix some MariaDB test failures
2024-12-02 19:21:03 +01:00
Niels Dossche
1a6f8a0b79
Fix some MariaDB test failures
...
Allow other wording too such that these mysqli tests pass.
Closes GH-17004.
2024-12-02 19:20:54 +01:00
David Carlier
60eca67439
Merge branch 'PHP-8.2' into PHP-8.3
2024-12-01 13:58:21 +00:00
David Carlier
73ebc92617
Fix GH-16959: snmpget modifies the object_id (as array).
...
Instead of modifying the zval, we use the zend_try_get_string.
close GH-16969
2024-12-01 13:57:31 +00:00
Niels Dossche
f1fc4e8ff7
Fix GH-16957: Assertion failure in array_shift with self-referencing array
...
We have an RC1 violation because we're immediately dereferencing and
copying the resulting array in the test case. Instead, transfer the
lifetime using RETVAL_COPY_VALUE and unwrap only after the internal
iterator is reset.
Closes GH-16970.
2024-11-29 19:21:11 +01:00
Christoph M. Becker
a4874bb418
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16991: Getting typeinfo of non DISPATCH variant segfaults
2024-11-29 16:30:01 +01:00
Christoph M. Becker
9bae8933a3
Fix GH-16991: Getting typeinfo of non DISPATCH variant segfaults
...
We must not assume that any `VARIANT` implements `IDispatch`.
Closes GH-16992.
2024-11-29 16:29:11 +01:00
Niels Dossche
6a195bd9e7
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16905: Internal iterator functions can't handle UNDEF properties
2024-11-28 19:22:36 +01:00
Niels Dossche
e1b4534790
Fix GH-16905: Internal iterator functions can't handle UNDEF properties
...
Closes GH-16907.
2024-11-28 19:22:10 +01:00
David Carlier
841e54daee
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-27 19:54:06 +00:00
David Carlier
7e8d6f941c
Revert "ext/gmp: gmp_pow fix FPE with large values."
...
This reverts commit d70b7811b0 .
2024-11-27 19:52:07 +00:00
David Carlier
45140e527f
Revert "ext/gmp: gmp_pow fix FPE with large values."
...
This reverts commit e0a0e216a9 .
2024-11-27 19:52:04 +00:00
Niels Dossche
21df4a97a3
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Backport GH-14962 to stable versions
2024-11-26 21:25:05 +01:00
Michael Orlitzky
ae84b81bfa
Backport GH-14962 to stable versions
...
Alpine CI regularly fails because of the sorting order of these tests.
See https://github.com/php/php-src/pull/14962#issuecomment-2498799881
Closes GH-16950.
2024-11-26 21:24:48 +01:00
Niels Dossche
89060216a3
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix various memory leaks in curl mime handling
2024-11-26 20:37:51 +01:00
Niels Dossche
a80f0b515a
Fix various memory leaks in curl mime handling
...
Closes GH-16745.
2024-11-26 20:37:22 +01:00
Derick Rethans
e43a398149
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-26 15:40:56 +00:00
Derick Rethans
d1b9d7ee83
Fixed CS
2024-11-26 15:40:46 +00:00
Christoph M. Becker
0b5de3014a
Use another for bug51056.phpt
...
This port is already used by san_ipv6_peer_matching.phpt, wo we choose
another port which is not explicitly used in our test suite. The
proper solution would be to use ephemeral ports[1], but our OpenSSL
`ServerClientTestCase` does not support this yet.
[1] <6ab4e330ac >
Closes GH-16871.
2024-11-25 22:06:04 +01:00
Niels Dossche
ff95138e38
Fix test expectation for PHP 8.3+
2024-11-25 20:33:14 +01:00
Niels Dossche
d50a56139c
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16902: Set of opcache tests fail zts+aarch64 (8.2-8.3)
2024-11-25 19:50:05 +01:00
Niels Dossche
de96b43d2a
Fix GH-16902: Set of opcache tests fail zts+aarch64 (8.2-8.3)
...
Closes GH-16925.
2024-11-25 19:49:33 +01:00
Niels Dossche
d9fada4a71
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16908: _ZendTestMagicCallForward does not handle references well
2024-11-25 19:38:50 +01:00
Niels Dossche
99f5653ebb
Fix GH-16908: _ZendTestMagicCallForward does not handle references well
...
This testing code was never meant to be used this way, but fixing this
will at least stop fuzzers from complaining about this, so might still
be worthwhile.
Closes GH-16919.
2024-11-25 19:38:33 +01:00
Christoph M. Becker
4ceae71954
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix potential conflict of copy_variation5-win32.phpt
2024-11-25 13:49:20 +01:00
Christoph M. Becker
12ef3da381
Fix potential conflict of copy_variation5-win32.phpt
...
copy_variation1.phpt also creates and deletes a file copy.tmp in the
same folder, so conflicts may occur[1]. We apply a quick fix.
[1] <https://github.com/php/php-src/actions/runs/11902293714/job/33167012826 >
Closes GH-16854.
2024-11-25 13:48:50 +01:00
Christoph M. Becker
cfcf5cfde8
Fix GH-16890: array_sum() with GMP can loose precision (LLP64)
...
We must use `mpz_fits_si_p()` instead of `mpz_fits_slong_p()` since the
latter is not suitable for LLP64 data models.
libgmp, however, does not define `mpz_fits_si_p()` (which is an mpir
addition), so we use `mpz_fits_slong_p()` there which should be fine.
Closes GH-16891.
2024-11-25 12:55:09 +01:00
Jakub Zelenka
ac57b81c7c
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-24 23:49:29 +01:00
Jakub Zelenka
173175badd
Merge branch 'PHP-8.1' into PHP-8.2
2024-11-24 23:49:04 +01:00
Jakub Zelenka
eb951b3d11
Increase MySQLi fake server read timeout for ASAN job
2024-11-24 23:48:27 +01:00
Jakub Zelenka
b707f42119
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-24 20:15:02 +01:00
Jakub Zelenka
06082671f4
Merge branch 'PHP-8.1' into PHP-8.2
2024-11-24 20:14:29 +01:00
Jakub Zelenka
51f5539914
Change port for mysqli fake server auth message test
2024-11-24 20:13:47 +01:00
Niels Dossche
9d39ff764e
Fix GH-16906: Reloading document can cause UAF in iterator
...
Closes GH-16909.
2024-11-24 18:19:45 +01:00
Christoph M. Becker
58ed759ba7
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
2024-11-20 19:12:40 +01:00
Dylan K. Taylor
ff3b4eca0e
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
...
There doesn't seem to be a thread post-startup hook that runs after
zend_startup_cb() that could be used for this
this fix is similar to accel_startup_ok() as seen here: fc1db70f10/ext/opcache/ZendAccelerator.c (L2631-L2634)
Closes GH-16853.
2024-11-20 19:11:44 +01:00
Christoph M. Becker
38ec780015
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Skip file_put_contents_variation7.phpt on Windows
2024-11-20 15:50:54 +01:00
Christoph M. Becker
3656a84c39
Skip file_put_contents_variation7.phpt on Windows
...
While the test obviously succeeds on Windows, it may occasionally
conflict with file_put_contents_variation7-win32.phpt[1], so we skip it
like we do for many other of these tests which have win32 pendants.
[1] <https://github.com/php/php-src/actions/runs/11527743659/job/32093951818 >
Closes GH-16722.
2024-11-20 15:50:24 +01:00
Jakub Zelenka
c70b97d8eb
Make MySQLnd protocol stmt test work on 32bit
...
Closes GH-16869.
2024-11-20 13:52:53 +01:00
Jakub Zelenka
ffff27f734
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-20 11:12:19 +01:00
Niels Dossche
f3ade203d7
Fix GHSA-r977-prxv-hc43
...
Move the bound check upwards. Since this doesn't generate output we can
check the bound first.
2024-11-20 11:07:04 +01:00
Jakub Zelenka
d37a20c4a2
Fix MySQLnd possible buffer over read in auth_protocol
2024-11-20 11:06:53 +01:00
Jakub Zelenka
a21e48a93a
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 11:06:43 +01:00
Jakub Zelenka
c595455300
Fix GHSA-h35g-vwh6-m678: Mysqlnd - various heap buffer over-reads
...
This fixes issues causing buffer over-read that leak heap content:
- RESP packet field default left over for COM_LIST
- RESP packet upsert filename
- OK packet message
- RESP packet for stmt row data
- ps_fetch_from_1_to_8_bytes
- ps_fetch_float
- ps_fetch_double
- ps_fetch_time
- ps_fetch_date
- ps_fetch_datetime
- ps_fetch_string
- ps_fetch_bit
- RESP packet for query row data (just possible overflow on 32bit)
It also adds various protocol tests using a new fake server.
2024-11-20 11:06:26 +01:00
Niels Dossche
fba659abb9
Fix GHSA-g665-fm4p-vhff: OOB access in ldap_escape
2024-11-20 11:06:12 +01:00
Jakub Zelenka
d7fe40868e
Fix GHSA-c5f2-jwm7-mmq2: stream HTTP fulluri CRLF injection
2024-11-20 11:06:02 +01:00
Niels Dossche
7a25e7728d
Fix GHSA-5hqh-c84r-qjcv: Integer overflow in the firebird quoter causing OOB writes
2024-11-20 11:05:55 +01:00
Niels Dossche
4a79a5a59a
Fix GHSA-5hqh-c84r-qjcv: Integer overflow in the dblib quoter causing OOB writes
2024-11-20 11:05:48 +01:00
Dmitry Stogov
d1a9281814
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Use the immutable twin of temporary op_array (#16861 )
2024-11-19 20:55:32 +03:00
Dmitry Stogov
ef5844a1ca
Use the immutable twin of temporary op_array ( #16861 )
2024-11-19 20:55:15 +03:00