Dmitry Stogov
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
Dmitry Stogov
94286cd596
Fix yet another indirect string modification by error handler problem
2021-12-02 16:16:54 +03:00
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
df16da3697
Fixed ext/bz2/tests/005.phpt test failure introduesed by 09547c64c2
2021-12-02 10:32:45 +03:00
Sara Golemon
ecea0cc517
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Bump for 8.0.15
2021-12-02 05:09:58 +00:00
Sara Golemon
999c6f2c5d
Bump for 8.0.15
2021-12-02 05:09:07 +00:00
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
9786eac9a3
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix clobering of operand by error handler in assignment to string offset
2021-12-02 00:46:27 +03:00
Dmitry Stogov
09547c64c2
Fix clobering of operand by error handler in assignment to string offset
...
In some cases new code requires two reallocations insead of one.
Fixes oss-fuzz #31716 , #36196 , #39739 and #40002
2021-12-02 00:24:05 +03:00
Dmitry Stogov
10cfe9f13b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Use proper functions
2021-12-01 22:45:15 +03:00
Dmitry Stogov
9f6ab78610
Use proper functions
2021-12-01 22:43:19 +03:00
Dmitry Stogov
c3766c08f4
Fix SCDF cleanup of unused basic block, kept only because of FREE of a loop var
...
Fixes oss-fuzz #41516
2021-12-01 18:03:08 +03:00
Dmitry Stogov
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
Derick Rethans
2fb7b6e3e9
Merge branch 'PHP-8.0' into PHP-8.1
2021-11-30 18:41:29 +00:00
Derick Rethans
977e132842
Merge branch 'PHP-7.4' into PHP-8.0
2021-11-30 18:41:16 +00:00
Derick Rethans
f533744c92
Prepare for 7.4.28
2021-11-30 18:40:42 +00:00
Dmitry Stogov
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
e7b31f57ec
JIT: Fix incorrect code produced for BOOL_NOT and [double, undef] operand
...
Fixes oss-fuzz #41531
2021-11-30 20:36:52 +03:00
Dmitry Stogov
afd881718e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix crash after indirect modification of string by user error handler
2021-11-30 16:09:58 +03:00
Dmitry Stogov
df434f056f
Fix crash after indirect modification of string by user error handler
...
Fixes oss-fuzz #39346
2021-11-30 16:07:38 +03:00
Dmitry Stogov
3564001502
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix incorrect reference counting inference
2021-11-30 13:00:04 +03:00
Dmitry Stogov
c1036194d6
JIT: Fix incorrect reference counting inference
...
Fixes oss-fuzz #40747
2021-11-30 12:58:54 +03:00
Dmitry Stogov
005d5f4df8
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix uninitialized result of ASSIGN_DIM[_OP] after clobbering array by user error handler
2021-11-30 11:41:55 +03:00
Dmitry Stogov
6e1fe96962
JIT: Fix uninitialized result of ASSIGN_DIM[_OP] after clobbering array by user error handler
...
Fixes oss-fuzz #41208
2021-11-30 11:40:18 +03:00
Dmitry Stogov
3c3626a903
Restore line, removed by mistake in b914122389
2021-11-30 09:44:36 +03:00
Dmitry Stogov
2d3ea98624
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed type inference (it's safe to ignore reference counting narrowing)
2021-11-29 23:39:37 +03:00
Dmitry Stogov
86430e8e01
Fixed type inference (it's safe to ignore reference counting narrowing)
2021-11-29 23:32:52 +03:00
Dmitry Stogov
23c5a6fd16
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix exception handling when next array element is already occupied
2021-11-29 21:57:29 +03:00
Dmitry Stogov
aff115547f
JIT: Fix exception handling when next array element is already occupied
...
Fixes oss-fuzz #41408
2021-11-29 21:44:00 +03:00
Christoph M. Becker
60717fcd34
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix #74604 : Out of bounds in php_pcre_replace_impl
2021-11-29 19:17:16 +01:00
Christoph M. Becker
816aa20391
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #74604 : Out of bounds in php_pcre_replace_impl
2021-11-29 19:15:20 +01:00
Christoph M. Becker
712fc54e85
Fix #74604 : Out of bounds in php_pcre_replace_impl
...
Trying to allocate a `zend_string` with a length only slighty smaller
than `SIZE_MAX` causes an integer overflow; we make sure that this
doesn't happen by catering to the maximal overhead of a `zend_string`.
Closes GH-7597.
2021-11-29 19:12:55 +01:00
Dmitry Stogov
b914122389
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
JIT: Fix named arguments handling
JIT: Fix named arguments handling
2021-11-29 18:43:24 +03:00
Dmitry Stogov
d955415114
JIT: Fix named arguments handling
...
Fixes oss-fuzz #41486
2021-11-29 18:39:50 +03:00
Dmitry Stogov
8f4cfe04eb
JIT: Fix named arguments handling
...
Fixes oss-fuzz #41486
2021-11-29 18:37:49 +03:00
Christoph M. Becker
b0823438a9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix #81659 : stream_get_contents() may unnecessarily overallocate
2021-11-29 14:50:19 +01:00
Christoph M. Becker
f3bd24a200
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81659 : stream_get_contents() may unnecessarily overallocate
2021-11-29 14:48:11 +01:00
Christoph M. Becker
31749aac62
Fix #81659 : stream_get_contents() may unnecessarily overallocate
...
Since we're going to read from the current stream position anyway, the
`max_len` should be the size of the file minus the current position
(still catering to potentially filtered streams). We must, however,
make sure to cater to the file position being beyond the actual file
size.
While we're at, we also fix the step size in the comment, which is 8K.
A further optimization could be done for unfiltered streams, thus
saving that step size, but 8K might not be worth it.
Closes GH-7693.
2021-11-29 14:46:09 +01:00
Dmitry Stogov
c6e895aec2
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Disable type narrowing optimization when we contruct SSA for JIT
2021-11-29 15:53:16 +03:00
Dmitry Stogov
297117bbc5
Disable type narrowing optimization when we contruct SSA for JIT
...
This also revets incorrect fix introduced in f9518c3850
2021-11-29 15:51:54 +03:00
Jakub Zelenka
a529d0dd15
Merge branch 'PHP-8.0' into PHP-8.1
2021-11-27 22:39:51 +00:00
Jakub Zelenka
81513e6285
Add skip for FPM process idle flaky test
2021-11-27 22:37:43 +00:00
Patrick Allaert
99d130acbc
Reordering non bug entries
2021-11-27 13:18:59 +01:00
Patrick Allaert
75546bdef2
Standardize: Fixed Bug -> Fixed bug
2021-11-27 13:13:26 +01:00
Patrick Allaert
7f7f91536f
Placing core changes before anything else
2021-11-27 13:05:02 +01:00
Patrick Allaert
c459625df0
Removed placeholder from NEWS
2021-11-27 13:00:00 +01:00
Patrick Allaert
4e3192dd3c
Fixed misplaced PgSQL NEWS entry
2021-11-27 12:59:28 +01:00