840e441d2d
Fix parameter name in call_user_func() error message
...
This parameter name has been changed to $callback.
2021-07-29 12:48:25 +02:00
3244e0785d
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81252 : PDO_ODBC doesn't account for SQL_NO_TOTAL
2021-07-28 10:53:27 +02:00
98049e8b9a
Fix #81252 : PDO_ODBC doesn't account for SQL_NO_TOTAL
...
If `P->len` is negative (not only when it is `SQL_NULL_DATA`), we must
not go on, because the following code can't deal with that. This means
that the output parameter will be set to `NULL` without any indication
what went wrong, but it's still better than crashing.
Closes GH-7295.
2021-07-28 10:51:38 +02:00
65e2dbd0de
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Prevent mysqli::next_result from reporting errors from previous calls (#7304 )
2021-07-27 11:56:14 +01:00
d26069a2f1
Prevent mysqli::next_result from reporting errors from previous calls ( #7304 )
2021-07-27 11:50:28 +01:00
bf9afc184f
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81294 : Segfault when removing a filter
2021-07-27 12:14:22 +02:00
1fa26eccba
Fix #81294 : Segfault when removing a filter
...
We need to call the proper method.
Closes GH-7308.
2021-07-27 12:12:02 +02:00
71879d385e
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #81283 : shmop can't read beyond 2147483647 bytes
2021-07-23 17:49:56 +02:00
387c0de983
Fix #81283 : shmop can't read beyond 2147483647 bytes
...
`start`, `count` and `shmop->size` are `zend_long`, so we must not
restrict to `INT_MAX`.
Closes GH-7301.
2021-07-23 17:46:42 +02:00
90ee1c36d7
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix bug #66719
2021-07-23 11:24:59 +02:00
dfd05da97f
Fix bug #66719
...
While parent:: should inherit the called scope, it should only do
so if it is compatible. If there is no called scope, or it is not
a subtype of the scope, we should fall back to the scope.
2021-07-23 11:24:22 +02:00
8fbeebec34
Fixed typo
2021-07-22 16:14:26 +03:00
17b5fe13e2
Added test
2021-07-21 19:29:59 +03:00
053c56f52e
Fixed bug #81226 (Integer overflow behavior is different with JIT enabled)
2021-07-21 19:28:43 +03:00
0ba6ddefd5
retry ldap setup a few times in CI
2021-07-21 18:06:13 +02:00
f03e7c845e
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #74960 : Heap buffer overflow via str_repeat
2021-07-21 15:33:17 +02:00
760ff841a1
Fix #74960 : Heap buffer overflow via str_repeat
...
Trying to allocate a `zend_string` with a length only slighty smaller
than `SIZE_MAX` causes an integer overflow, so callers may need to
check that explicitly. To make that easy in a portable way, we
introduce `ZSTR_MAX_LEN`.
Closes GH-7294.
2021-07-21 15:31:37 +02:00
a9991fbf28
Fixed Bug #80959 (infinite loop in building cfg during JIT compilation)
2021-07-21 14:32:44 +03:00
a0893865b3
dom_import_simplexml() cannot return null
2021-07-21 11:13:37 +02:00
02acc5ad3b
Fixed Bug #81255 (Memory leak in PHPUnit with functional JIT)
2021-07-20 22:14:32 +03:00
bd2cd2617b
Create interned strings for internal union types
...
Just like for non-union types. These may be returned to userland
via reflection, and as such need to be interned.
2021-07-20 16:24:06 +02:00
9726bc6977
Duplicate possibly persistent string in phar metadata clone
2021-07-20 16:24:00 +02:00
b0d4d6ebb4
Create persistent interned string for password algos
...
These strings are returned to userland by password_algos(),
which violates thread-safety invariants. Create persistent
interned strings for them instead.
2021-07-20 15:13:50 +02:00
051ff33660
Fix bug #81272 : Fix func info for functions returning EMPTY_ARRAY
...
The empty array has refcount > 1, so we should indicate this in
func info. In most cases this renders the func info redundant,
so drop it entirely.
2021-07-20 14:40:17 +02:00
18abfcb306
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Revert "Fix #79908 : json_encode encodes negative zero as int"
2021-07-20 00:28:27 +02:00
2d2c001ca5
Revert "Fix #79908 : json_encode encodes negative zero as int"
...
This reverts commit 717f1ed5e4
2021-07-20 00:25:50 +02:00
ef77d3c89f
Fix #81206 : Multiple PHP processes crash with JIT enabled
...
We need to avoid resetting the JIT for all SAPIs, but we need to
initialize the JIT handlers even when only reattaching on Windows.
Closes GH-7208.
2021-07-19 23:45:37 +02:00
9d0fb10823
Merge branch 'PHP-7.4' into PHP-8.0
2021-07-19 15:08:09 +01:00
26b1572d37
Move date timezone cache destruction to post deactivate
...
Some extensions try to use the date features in their own shutdown,
most notably some logging functions. Because of that, move the
cache tear down until after these resources have been cleaned up.
2021-07-19 15:07:01 +01:00
15abbea5e7
Avoid ASAN integer overflow warnings
2021-07-19 14:53:23 +03:00
c5d93aeee9
Fixed incorrec immediate encoding when using LEA optimization
2021-07-19 14:51:08 +03:00
c0e4932816
Fixed bug #81249 (Intermittent property assignment failure with JIT enabled)
2021-07-19 12:11:09 +03:00
ee981619ce
Skip test on 32-bit system
2021-07-19 10:49:43 +03:00
9cd437138e
Fixed bug #81225 (Wrong result with pow operator with JIT enabled)
2021-07-19 10:39:52 +03:00
9fbcaa57aa
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #78238 : BCMath returns "-0"
2021-07-16 15:56:15 +02:00
bcb89c75ec
Fix #78238 : BCMath returns "-0"
...
There is no negative zero in the decimal system, so we must suppress
the sign.
Closes GH-7250.
2021-07-16 15:54:24 +02:00
12a858ac95
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix bug #81265 : getimagesize returns 0 for 256px ICO images
2021-07-16 10:07:26 +02:00
8f97f82e35
Fix bug #81265 : getimagesize returns 0 for 256px ICO images
...
Set ICO height/width to 256 if 0.
2021-07-16 10:05:58 +02:00
bb4dbbc150
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #80849 : HTTP Status header truncation
2021-07-15 19:13:58 +02:00
a054ef2aad
Fix #80849 : HTTP Status header truncation
...
While truncating the contents of a header is okay, we must never omit
the trailing CRLF.
Closes GH-7238.
2021-07-15 19:10:53 +02:00
fc6656e0ac
Fix some more ext/spl return types
...
Closes GH-7242
2021-07-15 16:40:29 +02:00
c6b7f6c39f
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #72595 : php_output_handler_append illegal write access
2021-07-15 15:29:48 +02:00
a942cf5b02
Fix #72595 : php_output_handler_append illegal write access
...
We must make sure that `handler->buffer.size + grow_max` does not
overflow, so we're using `safe_erealloc()` instead.
Closes GH-7241.
2021-07-15 15:26:42 +02:00
b9ae73eee9
Fix RecursiveIteratorIterator segfault for invalid aggregate
...
The code was assuming that the returned value is an object.
Reuse the logic from IteratorIterator.
2021-07-15 13:11:28 +02:00
c0a1ef3e32
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Fix #72146 : Integer overflow on substr_replace
2021-07-15 12:56:12 +02:00
33f8dfb15a
Fix #72146 : Integer overflow on substr_replace
...
Adding two `zend_long`s may overflow, and casting `size_t` to
`zend_long` may truncate; we can avoid this here by enforcing unsigned
arithmetic.
Closes GH-7240.
2021-07-15 12:54:28 +02:00
567e53ea58
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Undef slot before destroying in unset_property
2021-07-15 09:32:26 +02:00
ebd3a21002
Undef slot before destroying in unset_property
...
We need to make sure that destructors can't access the partially
destroyed property. Do the same we do in HTs.
Fixes oss-fuzz #36205 .
2021-07-15 09:31:19 +02:00
6fd880890c
Add exception check to zend_jit_fetch_obj_w_slow()
...
This ports 247105ae1a
2021-07-14 16:56:12 +02:00
982c833acd
Merge branch 'PHP-7.4' into PHP-8.0
...
* PHP-7.4:
Drop incorrect cache_slot optimization for typed properties
2021-07-14 15:10:11 +02:00
Nikita Popov