clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
122,905 Commits 491 Branches 1,363 Tags 837 MiB
84524afb9e
Commit Graph

122905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Peter Banyard
84524afb9e
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix Bug #81588 TokyoCabinet driver leaks memory
 2021-11-03 15:01:41 +00:00
George Peter Banyard
96dd310c54
Fix Bug #81588 TokyoCabinet driver leaks memory 2021-11-03 14:57:47 +00:00
Nikita Popov
546e55864d Fix WeakReference uniquing is TAG_HT is used 2021-11-03 10:06:22 +01:00
Derick Rethans
c5da497210 Merge branch 'PHP-7.4' into PHP-8.0 2021-11-02 16:39:55 +00:00
Derick Rethans
05b212bb3d Prepare for 7.4.27 2021-11-02 16:39:44 +00:00
Sara Golemon
2d4bfcfd3b
Prep for 8.0.14 2021-11-02 15:55:12 +00:00
Nikita Popov
a6d14f1143 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  CLDR 40a0 uses a lowercase "temp" instead of "Temp" in ICU >= 70.1
  Accommodate changes to canonicalized forms in ICU >= 70.1
  Change UBool to bool for equality operators in ICU >= 70.1
 2021-11-02 16:15:25 +01:00
Ben Ramsey
c7a2441e93 CLDR 40a0 uses a lowercase "temp" instead of "Temp" in ICU >= 70.1 
Refer to:
49dda34fb1
 2021-11-02 16:15:19 +01:00
Ben Ramsey
52cda6fc43 Accommodate changes to canonicalized forms in ICU >= 70.1 
Refer to:
01e1adc9e4
 2021-11-02 16:11:29 +01:00
Ben Ramsey
81b3f95622 Change UBool to bool for equality operators in ICU >= 70.1 
Refer to:
- 633438f8da
- f6325d49ba
 2021-11-02 16:07:51 +01:00
Dmitry Stogov
2605911272 Tracing JIT: Fixed reference counting when escape because of IS_UNDEF element (test) 2021-11-01 22:19:10 +03:00
Dmitry Stogov
d7ac39b02d Tracing JIT: Fixed reference counting when escape because of IS_UNDEF element 2021-11-01 22:14:12 +03:00
Dmitry Stogov
5c43e0c0ee Fixed incorrect assumption about reference counting 2021-11-01 20:28:05 +03:00
Dmitry Stogov
f1e6a7d83d JIT: Fixed numeric string index handling 2021-11-01 18:50:32 +03:00
Dmitry Stogov
cd32b47235 JIT: Fixed register allocation in case of integer overflow 2021-11-01 16:46:41 +03:00
Nikita Popov
2e29817005 Handle FETCH_DIM_R after FETCH_DIM_FUNC_ARG in inference 
This can happen if a call is optimized, but FETCH_DIM_FUNC_ARG
cannot be converted to FETCH_DIM_R because it uses an UNUSED op2,
which is not supported by FETCH_DIM_R.

Fixes oss-fuzz 6144185837682688.
 2021-11-01 14:26:36 +01:00
Nikita Popov
f8ec5a1d4c Fix range inference hang 
We shouldn't switch from range to no range for ZEND_DIV and instead
explicitly return an overflowing range. Otherwise the range will
not actually get updated during widening, and we'll perform
essentially infinite narrowing.

Fixes oss-fuzz #40566.
 2021-11-01 12:31:34 +01:00
Nikita Popov
1a2fb90bf4 Fix finally exception chaining on recursion 
In this case zend_exception_set_previous() would destroy the
fast_call exception and further accesses on ex would be invalid.
We should only update ex if we update EG(exception).

Fixes oss-fuzz #40464.
 2021-11-01 11:44:32 +01:00
Christoph M. Becker
91dfac6f2a
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  [ci skip] Fix typo (Okt → Oct)
 2021-10-26 16:30:48 +02:00
Christoph M. Becker
8a79668dbe
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  [ci skip] Fix typo (Okt → Oct)
 2021-10-26 16:28:14 +02:00
Christoph M. Becker
5f4e034e57
[ci skip] Fix typo (Okt → Oct) 2021-10-26 16:26:23 +02:00
Christoph M. Becker
82ab29580e
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
 2021-10-26 16:07:22 +02:00
Christoph M. Becker
5aaeeda744
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
 2021-10-26 16:05:26 +02:00
Jakub Zelenka
f47798e685
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation) 
The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
(cherry picked from commit cb2021e5f6)

Closes GH-7614.
 2021-10-26 16:03:33 +02:00
Christoph M. Becker
2a51efc2a0
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  [ci skip] Fix NEWS
 2021-10-25 12:50:20 +02:00
Christoph M. Becker
f4572d9e22
[ci skip] Fix NEWS 
Bug #81026 has already been fixed in PHP 7.4.25 and 8.0.12.
 2021-10-25 12:48:58 +02:00
Christoph M. Becker
6e6a8443a8
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #76167: mbstring may use pointer from some previous request
 2021-10-25 12:39:57 +02:00
Christoph M. Becker
d3d6d7906e
Fix #76167: mbstring may use pointer from some previous request 
We must not reuse per-request memory across multiple requests, so this
check triggered during RINIT makes no sense.  As explained in the bug
report[1], it can be even harmful, if some request startup fails, and
the pointers refer to already freed memory in the next request.

[1] <https://bugs.php.net/76167>

Closes GH-7604.
 2021-10-25 12:37:28 +02:00
Christoph M. Becker
5cc4088d69
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  fix for pcre2 10.38
 2021-10-25 11:59:37 +02:00
Dmitry Stogov
29c8c1e955 Tracing JIT: Fixed possible endless loop when escape from ZEND_CALL_TOP frame 2021-10-25 12:10:25 +03:00
Christopher Jones
3e9b53f2ec
Fix tests for method camel case change 2021-10-25 14:31:00 +11:00
Christopher Jones
51f1cacf7a
Fix tests for method camel case change 2021-10-25 14:17:28 +11:00
Dmitry Stogov
d3251632ad Tracing JIT: Fixed incorrect assumption about in-memeory zval type 2021-10-22 14:38:38 +03:00
Dmitry Stogov
c7e974fc4e Tracing JIT: Fixed incorrect assumtion about temporary variable types clobbered by *_ROPE instructions 2021-10-21 21:35:57 +03:00
Kamil Tekiela
c9d509b668
Revert "Fix bug GH-1 (mysqli_sql_exception->sqlstate is inaccessible)" 
This reverts commit 64fca5c5f0.
 2021-10-21 19:01:01 +01:00
Kamil Tekiela
64fca5c5f0
Fix bug GH-1 (mysqli_sql_exception->sqlstate is inaccessible) 2021-10-21 18:51:16 +01:00
Bob Weinand
345f46ff29 Fix weakmap API test 
Apparently under some targets the address can evaluate to an address with the most significant bit set. (displays as negative number)
 2021-10-21 19:31:37 +02:00
Remi Collet
a6f5c2dc8b
fix for pcre2 10.38 2021-10-21 13:37:26 +02:00
Bob Weinand
471102edcd Add ZEND_API for weakmap functionality via zend_weakrefs_hash_add/del 
Closes GH-7600.
 2021-10-21 13:34:22 +02:00
Remi Collet
56495ac031
fix for pcre2 10.38 2021-10-21 13:33:35 +02:00
Nikita Popov
decf906a90 Remove bug76738.phpt 
The test contains PII in the base64-encoded part and is way too
complicated to be useful. I'd try to reduce it, but I can't tell
what it's actually supposed to test.
 2021-10-21 10:40:12 +02:00
Dmitry Stogov
b69c6ba9df Use right frame 2021-10-20 23:50:33 +03:00
Dmitry Stogov
95c0dfc57f JIT: Fixed megamorphic call detection 2021-10-20 22:16:25 +03:00
Dmitry Stogov
38626dbaad JIT: Fixed memory leak 2021-10-20 10:38:47 +03:00
Stanislav Malyshev
23a607574e
Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Add FPM fix news
  Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)
 2021-10-18 15:07:13 -07:00
Jakub Zelenka
fadb1f8c1d
Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation) 
The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
 2021-10-18 15:06:36 -07:00
Stanislav Malyshev
6ab9b3865a
Add FPM fix news 2021-10-18 15:04:46 -07:00
Dmitry Stogov
6bd5271c62 Fixed incorrect optimization that may cause JIT assertion 2021-10-18 23:18:52 +03:00
Dmitry Stogov
d3063c02c6 Tracing JIT: Fixed memory leak 2021-10-18 22:14:53 +03:00
Dmitry Stogov
e59d0a7151 JIT: Fixed DASM_S_RANGE_VREG error 2021-10-18 17:58:42 +03:00