Christoph M. Becker
7ea3b19331
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8074: Wrong type inference of range() result
2022-02-22 10:20:13 +01:00
Christoph M. Becker
ef80dcb80b
Fix GH-8074: Wrong type inference of range() result
...
If either the first or second operand of `range()` may be a string, we
must not exclude the possibility that the result may be an array of
longs.
Closes GH-8131.
2022-02-22 10:14:54 +01:00
Dmitry Stogov
afbb9b9a1b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix register allocation
2022-02-18 17:15:51 +03:00
Dmitry Stogov
3198b8787b
JIT: Fix register allocation
...
Fixes oss-fuzz #44689
2022-02-18 17:15:07 +03:00
Dmitry Stogov
7e8257fbd2
Disable ASSIGN optimization for values inferred for fatal errors.
2022-02-18 11:35:43 +03:00
Dmitry Stogov
90ca8f97de
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Release lock and protect SHM before replaying warnings
2022-02-17 19:25:42 +03:00
Dmitry Stogov
8f5480e7eb
Release lock and protect SHM before replaying warnings
2022-02-17 19:16:15 +03:00
Nikita Popov
40e0bdb19d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Initialize int_codepoint in parse_code_point_param()
2022-02-16 19:03:33 +01:00
Nikita Popov
bfe9531dc1
Initialize int_codepoint in parse_code_point_param()
...
This is being passed to convert_cp(), and passing an uninitialized
value to a function is undefined behavior. Clang 14 makes use of
noundef facts aggressively and miscompiles this code if not
initialized.
2022-02-16 19:01:44 +01:00
Kamil Tekiela
2bae4e8dbb
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix bug GH-8058 - mysqlnd segfault when prepare fails
2022-02-14 12:02:57 +00:00
Kamil Tekiela
93a8d5cd17
Fix bug GH-8058 - mysqlnd segfault when prepare fails
...
Closes GH-8061
2022-02-14 11:45:17 +00:00
Stanislav Malyshev
414d5620b0
Merge branch 'PHP-8.0' into PHP-8.1
2022-02-13 21:58:24 -08:00
Christoph M. Becker
82f1bf1b6b
Fix #81708 : UAF due to php_filter_float() failing for ints
...
We must only release the zval, if we actually assign a new zval.
2022-02-13 21:56:39 -08:00
Dmitry Stogov
a584d12667
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed GH-8044 (var_export/debug_zval_dump HT_ASSERT_RC1 debug failure for SplFixedArray)
2022-02-11 15:35:57 +03:00
Dmitry Stogov
52ae6417ca
Fixed GH-8044 (var_export/debug_zval_dump HT_ASSERT_RC1 debug failure for SplFixedArray)
2022-02-11 15:33:31 +03:00
Dmitry Stogov
a506b0006e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fixed register clobbering during overflow handling
2022-02-11 13:45:55 +03:00
Dmitry Stogov
912608d89b
JIT: Fixed register clobbering during overflow handling
...
Fixes oss-fuzz #44535
2022-02-11 13:44:49 +03:00
Dmitry Stogov
0eb96b6e13
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix type inference
2022-02-11 13:04:12 +03:00
Dmitry Stogov
7434909dc6
Fix type inference
...
Fixes oss-fuzz #44407
2022-02-11 13:03:36 +03:00
Dmitry Stogov
bf515beb8e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix missed type store
2022-02-11 12:06:46 +03:00
Dmitry Stogov
0d6b173532
JIT: Fix missed type store
...
Fizes oss-fuzz #44376
2022-02-11 12:05:57 +03:00
Dmitry Stogov
55f1db6e5c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Tracing JIT: Fixed incorrect deoptimization info
2022-02-11 11:10:38 +03:00
Dmitry Stogov
d0f965d078
Tracing JIT: Fixed incorrect deoptimization info
2022-02-11 11:10:22 +03:00
Dmitry Stogov
5a8f24280c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Tracing JIT: Fixed incorrect deoptimization info
2022-02-11 11:09:20 +03:00
Dmitry Stogov
82bb169a08
Tracing JIT: Fixed incorrect deoptimization info
...
Fixes oss-fuzz #44294
2022-02-11 11:08:19 +03:00
Christoph M. Becker
4a630e67e9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed libpng warning when loading interlaced images
2022-02-08 10:48:21 +01:00
Brett
1d48da6da5
Fixed libpng warning when loading interlaced images
...
We enable interlace transform when reading png.
Closes GH-8002.
2022-02-08 10:46:50 +01:00
Christoph M. Becker
49466af4b6
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-7980: Unexpected result for iconv_mime_decode
2022-02-07 14:31:21 +01:00
Christoph M. Becker
86c196ba7f
Fix GH-7980: Unexpected result for iconv_mime_decode
...
We need to reset the shift state right after conversion, to cater to
potenially following plain encodings. Also, there is no need to reset
the shift for plain encodings, because these are not state-dependent.
Closes GH-8025.
2022-02-07 14:28:57 +01:00
Christoph M. Becker
8009b216e9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-7953: ob_clean() only does not set Content-Encoding
2022-02-03 16:13:11 +01:00
Christoph M. Becker
9bd468da63
Fix GH-7953: ob_clean() only does not set Content-Encoding
...
If an output handler has not yet been started, calling `ob_clean()`
causes it to start. If that happens, we must not forget to set the
`Content-Encoding` and `Vary` headers.
Closes GH-7960.
2022-02-03 16:09:00 +01:00
Dmitry Stogov
09bf3463dd
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix register alloction (missed store)
2022-02-01 22:06:18 +03:00
Dmitry Stogov
478448d271
JIT: Fix register alloction (missed store)
...
Fixes oss-fuzz #44242
2022-02-01 22:00:39 +03:00
Dmitry Stogov
718478377b
Prevent array modification if it's captured by user error handler during
...
index conversion
Fixes oss-fuzz #44235
2022-02-01 17:22:18 +03:00
Dmitry Stogov
a23f3dd010
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix incorrect type store elimination
2022-01-28 16:28:44 +03:00
Dmitry Stogov
54c952f11f
JIT: Fix incorrect type store elimination
...
Fixes oss-fuzz #43737
2022-01-28 16:27:55 +03:00
Dmitry Stogov
f4a3868639
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix incorrect register allocation
2022-01-28 13:08:56 +03:00
Dmitry Stogov
f711c9603d
Fix incorrect register allocation
...
Fixes oss-fuzz #44006
2022-01-28 13:08:11 +03:00
Dmitry Stogov
34c2324fbf
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix too aggressive DCE that leads to memory leak
2022-01-28 12:18:47 +03:00
Dmitry Stogov
965dafe3e1
Fix too aggressive DCE that leads to memory leak
...
Fixes oss-fuzz #43738
2022-01-28 12:17:46 +03:00
Christoph M. Becker
943d6f642a
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-7978: sockets extension compilation errors
2022-01-21 23:59:26 +01:00
David Carlier
07aaa34cd4
Fix GH-7978: sockets extension compilation errors
...
We fix the `ucred` detection when custom `CFLAGS` are in use.
Closes GH-7981.
2022-01-21 23:56:56 +01:00
Christoph M. Becker
d2ec5bec29
Make gh7875.phpt more resilient
...
Apparently, on Cirrus CI FreeBSD chmodding a file to 0444 doesn't make
it readonly. So in this case, we skip the test.
[1] <https://github.com/php/php-src/pull/7975 >
2022-01-21 17:49:00 +01:00
Kamil Tekiela
1605e6fd9f
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix coding style from previous commit
2022-01-20 11:18:03 +00:00
Kamil Tekiela
82b883034c
Fix coding style from previous commit
2022-01-20 11:17:18 +00:00
Kamil Tekiela
1f0661d3e5
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Strip MariaDB 10 prefix
2022-01-19 21:45:19 +00:00
Kamil Tekiela
5fc0db989e
Strip MariaDB 10 prefix
...
Closes GH-7972
2022-01-19 21:39:42 +00:00
Christoph M. Becker
69f6b09b2a
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-7902: mb_send_mail may delimit headers with LF only
2022-01-18 13:09:52 +01:00
Christoph M. Becker
03816fba46
Fix GH-7902: mb_send_mail may delimit headers with LF only
...
Email headers are supposed to be separated with CRLF. Period.
We introduce a `CRLF` macro for better comprehensibility right away.
Closes GH-7907.
2022-01-18 13:08:08 +01:00
Christoph M. Becker
79bf39e917
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-7875: mails are sent even if failure to log throws exception
2022-01-17 22:32:37 +01:00