fe1f613b75
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix use after free because of data clobbering by user error handler
2021-12-06 13:09:26 +03:00
5459ed4c2f
Fix use after free because of data clobbering by user error handler
...
Fixes oss-fuzz #41692
2021-12-06 13:08:27 +03:00
ebb7b173b0
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix refcount inferemce ($a += $a returns old array with RCN)
2021-12-06 11:32:02 +03:00
4ed10f3d47
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix refcount inferemce ($a += $a returns old array with RCN)
2021-12-06 11:31:51 +03:00
aa7280264e
Fix refcount inferemce ($a += $a returns old array with RCN)
...
Fixes oss-fuzz #41670
2021-12-06 11:30:03 +03:00
e32642c541
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix bug #81598 : Use C.UTF-8 as LC_CTYPE locale by default
2021-12-05 21:04:10 +01:00
26e424465c
Fix bug #81598 : Use C.UTF-8 as LC_CTYPE locale by default
...
Unfortunately, libedit is locale based and does not accept UTF-8
input when the C locale is used. This patch switches the default
locale to C.UTF-8 instead (if it is available). This makes libedit
work and I believe it shouldn't affect behavior of single-byte
locale-dependent functions that PHP otherwise uses.
Closes GH-7635.
2021-12-05 21:03:27 +01:00
dea548be60
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix #81658 : MYSQL_OPT_LOAD_DATA_LOCAL_DIR not available in MariaDB
2021-12-05 19:11:32 +01:00
15e7e570a5
Fix #81658 : MYSQL_OPT_LOAD_DATA_LOCAL_DIR not available in MariaDB
...
This also introduces the boolean userland constant `MYSQLI_IS_MARIADB`.
2021-12-05 19:11:04 +01:00
3be0ce653b
Report wireless network interfaces on Windows too
...
There is no particular reason to exclude wireless network interfaces
from the results of `net_get_interfaces()` on Windows, especially since
`getifaddrs(3)` includes these as well.
Closes GH-7718.
2021-12-05 16:05:31 +01:00
024d5f4b63
Cache method overrides of ArrayAccess in zend_class_entry
...
Previously, code such as subclasses of SplFixedArray would check for method
overrides when instantiating the objects.
This optimization was mentioned as a followup to GH-6552
2021-12-04 11:35:38 -05:00
97f78b3bb7
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix #81693 : mb_check_encoding(7bit) segfaults
2021-12-03 22:50:27 +01:00
929d847152
Fix #81693 : mb_check_encoding(7bit) segfaults
...
`php_mb_check_encoding()` now uses conversion to `mbfl_encoding_wchar`.
Since `mbfl_encoding_7bit` has no `input_filter`, no filter can be
found. Since we don't actually need to convert to wchar, we encode to
8bit.
Closes GH-7712.
2021-12-03 22:49:47 +01:00
a9c2dcd80f
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add missing "return"
2021-12-03 13:53:11 +03:00
7a6fb9751e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Add missing "return"
2021-12-03 13:52:29 +03:00
c9901aa594
Add missing "return"
2021-12-03 13:52:10 +03:00
1195ab8969
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add test
ws
Fix array object clobbering by user error handler
2021-12-03 13:41:12 +03:00
e52f57cf6b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Add test
ws
2021-12-03 13:40:27 +03:00
4a5c05a49d
ws
2021-12-03 13:40:01 +03:00
731ce6be01
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix array object clobbering by user error handler
2021-12-03 13:36:33 +03:00
1d054b3fa7
Fix array object clobbering by user error handler
...
Fixes oss-fuss #41605 and #41610
2021-12-03 13:35:28 +03:00
f22e29a35e
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix register clobbering
2021-12-03 11:15:03 +03:00
dd2c30a97e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix register clobbering
2021-12-03 11:14:54 +03:00
2515e788bc
JIT: Fix register clobbering
...
Fixes oss-fuzz #41621
2021-12-03 11:13:50 +03:00
2658925e60
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix #81681 : ReflectionEnum throwing exceptions
2021-12-02 23:22:47 +01:00
59dd4fd742
Fix #81681 : ReflectionEnum throwing exceptions
...
Enums are neither instantiable nor cloneable.
Closes GH-7707.
2021-12-02 23:22:07 +01:00
d102f272c1
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Tracing JIT: Fixed Zend/tests/str_offset_008.phpt failure
2021-12-02 23:55:48 +03:00
9a3ca278b3
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Tracing JIT: Fixed Zend/tests/str_offset_008.phpt failure
2021-12-02 23:55:33 +03:00
c4ee66856e
Tracing JIT: Fixed Zend/tests/str_offset_008.phpt failure
2021-12-02 23:47:36 +03:00
cdc5adb354
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add test
2021-12-02 22:51:24 +03:00
42a162e535
Add test
2021-12-02 22:50:55 +03:00
88dc5cb3d8
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix ASSIGN_DIM_OP with undefined variable and index and user error handler, throwing an exception
2021-12-02 22:25:15 +03:00
b4680b056c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix ASSIGN_DIM_OP with undefined variable and index and user error handler, throwing an exception
2021-12-02 22:24:06 +03:00
2fde308fc6
JIT: Fix ASSIGN_DIM_OP with undefined variable and index and user error handler, throwing an exception
...
Fixes oss-fuzz #39422
2021-12-02 22:19:48 +03:00
d29e93870a
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix yet another indirect string modification by error handler problem
2021-12-02 16:17:35 +03:00
ddcfffad2c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix yet another indirect string modification by error handler problem
2021-12-02 16:17:26 +03:00
94286cd596
Fix yet another indirect string modification by error handler problem
2021-12-02 16:16:54 +03:00
da0d4bf7fc
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add missing zend_string_release_ex(tmp, 0) and cleanup
2021-12-02 11:22:24 +03:00
b9ff359a99
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Add missing zend_string_release_ex(tmp, 0) and cleanup
2021-12-02 11:21:04 +03:00
37ac707cac
Add missing zend_string_release_ex(tmp, 0) and cleanup
...
- use GC_DELREF() instead of zend_string_release_ex()
- add expectations for exceptional cases
- replace IS_ARRAY_IMMUTABLE by IS_STR_INTERNED
2021-12-02 11:18:08 +03:00
17fac12ed4
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c64c2
2021-12-02 10:35:44 +03:00
4eaba3e2ed
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c64c2
2021-12-02 10:34:14 +03:00
df16da3697
Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c64c2
2021-12-02 10:32:45 +03:00
2384112ec8
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix clobering of operand by error handler in assignment to string offset (optimization and JIT support)
2021-12-02 01:22:27 +03:00
e833e5cfa0
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix clobering of operand by error handler in assignment to string offset (optimization and JIT support)
2021-12-02 01:20:48 +03:00
4595a57e99
Fix clobering of operand by error handler in assignment to string offset (optimization and JIT support)
2021-12-02 01:20:17 +03:00
db806d70ed
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fixed crash in ZEND_ASSIGN_DIM_OP because of array cloberring by user error handler
2021-11-30 23:34:50 +03:00
b594a95a2f
Fixed crash in ZEND_ASSIGN_DIM_OP because of array cloberring by user error handler
...
Fixes oss-fuzz #36214
2021-11-30 23:33:34 +03:00
26449de4d8
Merge branch 'PHP-8.1'
...
* PHP-8.1:
JIT: Fix incorrect code produced for BOOL_NOT and [double, undef] operand
2021-11-30 20:45:57 +03:00
07389566ac
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix incorrect code produced for BOOL_NOT and [double, undef] operand
2021-11-30 20:44:46 +03:00
Dmitry Stogov