1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Commit Graph

68098 Commits

Author SHA1 Message Date
Niels Dossche
3d3c192666 Merge branch 'PHP-8.4'
* PHP-8.4:
  Fix GH-16237: Segmentation fault when cloning SoapServer
2024-10-05 14:14:28 +02:00
Niels Dossche
70203c7781 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-16237: Segmentation fault when cloning SoapServer
2024-10-05 14:14:20 +02:00
Niels Dossche
eb02ad08da Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix GH-16237: Segmentation fault when cloning SoapServer
2024-10-05 14:13:55 +02:00
Niels Dossche
809a58bc1b Fix GH-16237: Segmentation fault when cloning SoapServer
Bisect points to 94ee4f9, however this only reveals the problem.
Cloning an object on a lower branch and trying to call its methods
crashes as well. Cloning the object shouldn't be possible in the first
place because there's an engine constraint that when we have a new
object handler we should also have a clone handler. This constraint is
not fulfilled here.

Closes GH-16245.
2024-10-05 14:13:29 +02:00
David Carlier
671200ac95 Merge branch 'PHP-8.4' 2024-10-05 13:10:18 +01:00
David Carlier
cb044174a7 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-05 13:09:57 +01:00
David Carlier
2863d8214f Merge branch 'PHP-8.2' into PHP-8.3 2024-10-05 13:09:43 +01:00
David Carlier
a3ff092c12 Fix GH-16228 overflow on easter_days/easter_date year argument.
close GH-16241
2024-10-05 13:08:43 +01:00
Gina Peter Banyard
e01cde7b1b ext/ldap: Pass a HashTable directly to parse individual control
Rename function to not have a leading "_" at the same time
2024-10-05 12:48:59 +01:00
Gina Peter Banyard
d7f946d28b ext/ldap: Use bool instead of int 2024-10-05 12:48:59 +01:00
Gina Peter Banyard
f60487821d ext/ldap: Remove an unnecessary duplication 2024-10-05 12:48:59 +01:00
Gina Peter Banyard
636b6a1a59 ext/ldap: Parse attribute value via new API in do_modify
Add a new API to free a zend_string via its char*
2024-10-05 12:48:59 +01:00
Gina Peter Banyard
495837bfa9 ext/ldap: Add API parsing zval to LDAP value 2024-10-05 12:48:59 +01:00
David Carlier
9709887815 Merge branch 'PHP-8.4' 2024-10-05 11:35:57 +01:00
David Carlier
215c61f9c7 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-05 11:34:59 +01:00
David Carlier
8ff179529a Merge branch 'PHP-8.2' into PHP-8.3 2024-10-05 11:34:49 +01:00
David Carlier
54973c9366 Fix GH-16232: bitshift overflow on wbmp file content reading.
backport from a8f1d5cab0

close GH-16239
2024-10-05 11:34:31 +01:00
David Carlier
3b9676762b Merge branch 'PHP-8.4' 2024-10-05 10:48:08 +01:00
David Carlier
71e5d77f39 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-05 10:47:36 +01:00
David Carlier
d89cf7b6c7 Merge branch 'PHP-8.2' into PHP-8.3 2024-10-05 10:47:26 +01:00
David Carlier
f4d2dd038b Fix GH-16231 jdtounix overflow on argument value.
Close GH-16240
2024-10-05 10:47:06 +01:00
Yuya Hamada
4ac65b4c6b Merge branch 'PHP-8.4' 2024-10-05 18:29:39 +09:00
Yuya Hamada
f815310c98 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-05 18:28:43 +09:00
Yuya Hamada
4e23d3945a Merge branch 'PHP-8.2' into PHP-8.3 2024-10-05 18:26:25 +09:00
Yuya Hamada
d840200cea Fix GH-16229: Address overflowed in mb_send_mail when empty string 2024-10-05 18:24:09 +09:00
Niels Dossche
5ffe6f1644 Merge branch 'PHP-8.4'
* PHP-8.4:
  Fix GH-16187: ReflectionClass::__toString() with packed properties hash table
2024-10-05 10:21:30 +02:00
Niels Dossche
6631aa9cc3 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-05 10:20:49 +02:00
Niels Dossche
158ba541c2 Merge branch 'PHP-8.2' into PHP-8.3 2024-10-05 10:18:56 +02:00
Daniel Scherzer
331da7e869 Fix GH-16187: ReflectionClass::__toString() with packed properties hash table
Closes GH-16192.
2024-10-05 10:18:11 +02:00
Niels Dossche
ed8d6b5b25 Merge branch 'PHP-8.4'
* PHP-8.4:
  Use standard error message for stack limit in serialize()
2024-10-04 20:10:04 +02:00
Niels Dossche
612a6ad0af Use standard error message for stack limit in serialize()
With GH-16204 merged, we can use the standard error message for the
recently-merged GH-16159.

Closes GH-16225.
2024-10-04 20:09:45 +02:00
DanielEScherzer
2501cad25a Stubs and generated arginfo: remove tentative returns from final methods (#16213)
A tentative return type is used to allow userland code that overrides a method
to not include a typehint without a fatal error; this is inapplicable to final
methods (including all methods of final classes), which cannot be overridden.
Remove the tentative return declarations, and update the build script to
complain about future additions.
2024-10-04 07:43:59 +02:00
Niels Dossche
0624eb4118 Merge branch 'PHP-8.4'
* PHP-8.4:
  Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c
2024-10-03 21:13:13 +02:00
Niels Dossche
5839fc5dd9 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c
2024-10-03 21:12:42 +02:00
Niels Dossche
ddc7a6b1fc Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c
2024-10-03 21:11:25 +02:00
Niels Dossche
c4bb07552e Fix GH-16184: UBSan address overflowed in ext/pcre/php_pcre.c
libpcre2 can return the special value -1 for a non-match.
In this case we get pointer overflow, although it doesn't matter in
practice because the pointer will be in bounds and the copy length will
be 0. Still, we should fix the UBSAN warning.

Closes GH-16205.
2024-10-03 21:10:57 +02:00
David CARLIER
dbcc77d0c2 Fix GH-15893: Pdo\Pgsql backport fixes from GH-16124 (#16158) 2024-10-03 19:25:39 +01:00
Niels Dossche
8a6de2ca14 Merge branch 'PHP-8.4'
* PHP-8.4:
  Fix bugs GH-16150 and GH-16152: intern document mismanagement
2024-10-03 19:33:15 +02:00
Niels Dossche
ba0834bc2c Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix bugs GH-16150 and GH-16152: intern document mismanagement
2024-10-03 19:33:09 +02:00
Niels Dossche
d4a4d2e7a9 Fix bugs GH-16150 and GH-16152: intern document mismanagement
The reference counts of the internal document pointer are mismanaged.
In the case of fragments the refcount may be increased too much, while
for other cases the document reference may not be applied to all
children.

This bug existed for a long time and this doesn't reproduce (easily)
on 8.2 due to other bugs. Furthermore 8.2 will enter security mode soon,
and this change may be too risky.

Fixes GH-16150.
Fixed GH-16152.
Closes GH-16178.
2024-10-03 19:28:50 +02:00
Niels Dossche
807a74a7ac Merge branch 'PHP-8.4'
* PHP-8.4:
  Fix GH-16190: Using reflection to call Dom\Node::__construct causes assertion failure
2024-10-03 19:26:14 +02:00
Niels Dossche
3be6ff66b8 Fix GH-16190: Using reflection to call Dom\Node::__construct causes assertion failure
Closes GH-16193.
2024-10-03 19:25:58 +02:00
David Carlier
95fa39dce8 Merge branch 'PHP-8.4' 2024-10-03 12:49:42 +01:00
David Carlier
f5d4781ee0 Merge branch 'PHP-8.3' into PHP-8.4 2024-10-03 12:48:46 +01:00
David Carlier
1aeb70f83c Merge branch 'PHP-8.2' into PHP-8.3 2024-10-03 12:48:34 +01:00
David Carlier
f453d1ae2a Fix GH-16189: underflow on preg_match/preg_match_all start_offset.
close GH-16191
2024-10-03 12:48:13 +01:00
Niels Dossche
c77a1291d6 Don't use recursion when transferring a DOM internal document pointer (#16180)
Recursion is typically slower than iteration, and furthermore, this can
cause problems in theory with deep trees.
2024-10-03 07:56:12 +02:00
DanielEScherzer
8b8a6733d1 ext/reflection: fix some typos [skip ci] (#16183) 2024-10-03 07:55:25 +02:00
Gina Peter Banyard
524f6dfb19 ext/ldap: Use zend_string_equals() API 2024-10-02 23:22:34 +01:00
Gina Peter Banyard
355f320a27 ext/ldap: Use HashTable* for controls 2024-10-02 23:22:34 +01:00