1
0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Commit Graph

63008 Commits

Author SHA1 Message Date
Derick Rethans
e32d1d9017 Merge branch 'PHP-8.2' 2022-10-19 16:03:09 +01:00
Derick Rethans
0a1a9997c7 Merge branch 'PHP-8.1' into PHP-8.2 2022-10-19 16:03:02 +01:00
Derick Rethans
df085f4678 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-19 16:02:57 +01:00
Derick Rethans
011b7f9840 Test for bug #78055 (DatePeriod's getRecurrences and ->recurrences don't match) 2022-10-19 16:02:49 +01:00
Christoph M. Becker
87f1f5dc02 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9372: HY010 when binding overlong parameter
2022-10-19 11:37:30 +02:00
Christoph M. Becker
f5aaa8f187 Fix GH-9372: HY010 when binding overlong parameter
If `SQLPutData()` *fails*, we should not call `SQLParamData()` again,
because that yields the confusing `HY010` (Function sequence error).
Instead we properly handle `SQLPutData()` errors.

For the given case (paramter length > column length), some drivers let
`SQLPutData()` fail, while others do not.  Either behavior seems to
conform to the ODBC specification.  Anyhow, we do not want to silently
truncate the given parameter, since that would break the behavior for
drivers which do not fail, but still don't simply truncate the given
parameter.  So it is finally up to userland to avoid passing overlong
parameters – with this patch they at least get useful information about
the actual issue.

Closes GH-9541.
2022-10-19 11:37:05 +02:00
Derick Rethans
54056769e9 Merge branch 'PHP-8.2' 2022-10-17 18:22:47 +01:00
Derick Rethans
2e6b317fe3 Merge branch 'PHP-8.1' into PHP-8.2 2022-10-17 18:22:42 +01:00
Derick Rethans
25744dd73c Merge branch 'PHP-8.0' into PHP-8.1 2022-10-17 18:22:36 +01:00
Derick Rethans
7b48053293 Fixed GH-9763: DateTimeZone ctr mishandles input and adds null byte if the argument is an offset larger than 100*60 minutes 2022-10-17 17:08:44 +01:00
Dmitry Stogov
5a68d991ad Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix memory leak
2022-10-17 15:09:33 +03:00
Dmitry Stogov
eecbb60db6 Fix memory leak
Fixes oss-fuzz #52479
2022-10-17 15:08:21 +03:00
Dmitry Stogov
61b2b3e99c Merge branch 'PHP-8.2'
* PHP-8.2:
  Reset JIT for dynamic functions on opcache restrart
2022-10-17 11:27:20 +03:00
Dmitry Stogov
d282345e11 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Reset JIT for dynamic functions on opcache restrart
2022-10-17 11:27:12 +03:00
Dmitry Stogov
61e563ca40 Reset JIT for dynamic functions on opcache restrart 2022-10-17 11:26:30 +03:00
Dmitry Stogov
63c8ad4c7e Merge branch 'PHP-8.2'
* PHP-8.2:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:20 +03:00
Dmitry Stogov
5e10aa4e5f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:08 +03:00
Dmitry Stogov
3e076ddf06 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Discard disasm symbols on opcache restart
2022-10-17 11:24:00 +03:00
Dmitry Stogov
cefb228e15 Discard disasm symbols on opcache restart 2022-10-17 11:22:59 +03:00
Kévin Dunglas
e6bfd7e089 Set SA_ONSTACK too when zend signals are disabled and in pcntl
Closes GH-9758.
2022-10-16 23:47:53 +01:00
Jakub Zelenka
18fe337bae Fix bug #51056: fread() on blocking stream will block even if data is available
This is applied only on socket connection which already returns
immediately if there is no data in the buffer.
2022-10-16 12:17:47 +01:00
Kévin Dunglas
c8c09b4aae opcache: add FrankenPHP to the allow list 2022-10-15 14:30:17 +02:00
David Carlier
35b5aceff3 SO_ATTACH_REUSEPORT_CBPF filter update. SDK_AD_QUEUE support to attach to a queue.
Closes #9690
2022-10-15 11:22:26 +01:00
Christoph M. Becker
d758f58672 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:08:50 +02:00
Christoph M. Becker
aba82c74d9 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:08:34 +02:00
Christoph M. Becker
24c297086d Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix GH-9720: Null pointer dereference while serializing the response
2022-10-13 16:00:36 +02:00
Christoph M. Becker
e440e37fa8 Fix GH-9720: Null pointer dereference while serializing the response
When traversing the result array, we need to cater to `param_name`
possibly being `NULL`.  Prior to PHP 7.0.0, this was implicitly done
because `param_name` was of type `char*`.

Closes GH-9739.
2022-10-13 15:56:08 +02:00
juan-morales
fca9e23a6f QA - filter_input - LCOV - FILTER_NULL_ON_FAILURE
Closes GH-9737.
2022-10-13 13:59:48 +02:00
Máté Kocsis
a4fd2609ce Declare ext/standard constants in stubs - part 9 (#9717) 2022-10-13 13:13:36 +02:00
Christoph M. Becker
e4e6c3e960 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix potential heap corruption due to alignment mismatch
2022-10-13 11:48:26 +02:00
Christoph M. Becker
3193c037d2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix potential heap corruption due to alignment mismatch
2022-10-13 11:48:07 +02:00
Christoph M. Becker
7e14d2466a Fix potential heap corruption due to alignment mismatch
The fix for bug 63327[1] changed the extra size of mysqlnd allocations
from `sizeof(size_t)` to the properly aligned values; however, the
allocation in `_mysqlnd_pestrdup()` has apparently been overlooked,
which (currently) causes detectable heap corruption when running
mysqli_get_client_stats.phpt on 32bit Windows versions.

[1] <338a47bb85>

Closes GH-9724.
2022-10-13 11:47:24 +02:00
Christoph M. Becker
3b5a9da2dc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Updated to version 2022.5 (2022e)
  Updated to version 2022.5 (2022e)
2022-10-13 11:43:33 +02:00
Máté Kocsis
f6ef5fbb0a Declare ext/standard constants in stubs - part 12 (#9729) 2022-10-12 13:04:14 +02:00
Máté Kocsis
c59e94fc9d Declare ext/stanard constants in stubs - part 11 (#9728) 2022-10-12 12:07:03 +02:00
Máté Kocsis
fc11a8abcb Declare XML_SAX_IMPL constant in stubs (#9732) 2022-10-12 11:42:24 +02:00
Derick Rethans
fd3d3117b5 Updated to version 2022.5 (2022e) 2022-10-12 09:37:31 +01:00
Derick Rethans
577b904fdc Updated to version 2022.5 (2022e) 2022-10-12 09:37:30 +01:00
Derick Rethans
24963be8ef Updated to version 2022.5 (2022e) 2022-10-12 09:37:28 +01:00
Máté Kocsis
433ed0973a Declare ext/standard constants in stubs - part 10 (#9719) 2022-10-12 08:16:19 +02:00
Dmitry Stogov
5b65594d78 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix crashes after opcache restart
  [ci skip] Update NEWS for PHP 8.2.0RC5
2022-10-11 14:25:36 +03:00
Dmitry Stogov
46fcf33c7b Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix crashes after opcache restart
2022-10-11 14:23:59 +03:00
Dmitry Stogov
c5364b851a Fix crashes after opcache restart 2022-10-11 14:23:12 +03:00
Bob Weinand
fabfe1e334 Merge branch 'PHP-8.2' 2022-10-11 01:06:09 +02:00
Bob Weinand
9be00e3935 Ensure driver specific PDO methods have a proper run_time_cache 2022-10-11 00:53:19 +02:00
Alex Dowad
ec999f815c Merge branch 'PHP-8.2'
* PHP-8.2:
  Add regression test for problem with mb_encode_mimeheader reported as GH-9683
  In legacy text conversion filters, reset filter state in 'flush' function
2022-10-10 20:49:16 +09:00
Alex Dowad
a116aaebd9 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add regression test for problem with mb_encode_mimeheader reported as GH-9683
  In legacy text conversion filters, reset filter state in 'flush' function
2022-10-10 20:48:10 +09:00
Alex Dowad
faa5425b0f Add regression test for problem with mb_encode_mimeheader reported as GH-9683 2022-10-10 20:46:12 +09:00
Alex Dowad
5812b4fe54 In legacy text conversion filters, reset filter state in 'flush' function
Up until now, I believed that mbstring had been designed such
that (legacy) text conversion filter objects should not be
re-used after the 'flush' function is called to complete a
text conversion operation.

However, it turns out that the implementation of
_php_mb_encoding_handler_ex DID re-use filter objects
after flush. That means that functions which were based on
_php_mb_encoding_handler_ex, including mb_parse_str and
php_mb_post_handler, would break in some cases; state left
over from converting one substring (perhaps a variable name)
would affect the results of converting another substring
(perhaps the value of the same variable), and could cause
extraneous characters to get inserted into the output.

All this code should be deleted soon, but fixing it helps me
to avoid spurious failures when fuzzing the new/old code to
look for differences in behavior.

(This bug fix commit was originally applied to PHP-8.2 when fuzzing
the new mbstring text conversion code to check for differences with
the old code. Later, Kentaro Ohkouchi kindly reported a problem with
mb_encode_mimeheader under PHP 8.1 which was caused by the same issue.
Hence, this commit was backported to PHP-8.1.)

Fixes GH-9683.
2022-10-10 20:46:12 +09:00
Christoph M. Becker
2979743ac2 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9589: dl() segfaults when module is already loaded
  Fix GH-9566: disable assembly for Fiber on FreeBSD i386.
2022-10-10 13:37:30 +02:00