php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,186 Commits 547 Branches 1,483 Tags
217fd932fa57d746ea4786b01d49321199a2f3d5
Commit Graph

127186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
217fd932fa Merge branch 'PHP-8.1' 
* PHP-8.1:
  Bump for 8.0.15
 2021-12-02 05:10:18 +00: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
2384112ec8 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix clobering of operand by error handler in assignment to string offset (optimization and JIT support)
 2021-12-02 01:22:27 +03:00
Dmitry Stogov
c8dca00d15 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix clobering of operand by error handler in assignment to string offset
 2021-12-02 01:22:15 +03: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
bdf6779c7d Merge branch 'PHP-8.1' 
* PHP-8.1:
  Use proper functions
 2021-12-01 22:45:26 +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
923bd51599 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix SCDF cleanup of unused basic block, kept only because of FREE of a loop var
 2021-12-01 18:04:47 +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
db806d70ed Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fixed crash in ZEND_ASSIGN_DIM_OP because of array cloberring by user error handler
 2021-11-30 23:34:50 +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
36b2b3e80e Merge branch 'PHP-8.1' 2021-11-30 18:41:35 +00: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
26449de4d8 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix incorrect code produced for BOOL_NOT and [double, undef] operand
 2021-11-30 20:45:57 +03: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
David CARLIER
283669f1ae pcntl add forkx for solaris based systems. (#7654) 2021-11-30 15:47:14 +01:00
Tyson Andre
032de9e001 Optimize SplObjectStorage native read/write/has/unset dimension handlers 
This makes reading/writing with `$splObjectStorage[$offset]` shorthand twice as
fast as it was previously, and a bit faster than offsetGet/offsetSet instead of
(previously) much slower.

Call destructor after overriding old SplObjectStorage entry.
Previously, it was called before, which was possibly unsafe
if the destructor had side effects.

Add tests.

Closes GH-7695

Related to GH-7690

Check for ref in SplObjectStorage->__unserialize, check for ref.

SplObjectStorage->unserialize may be a different cause of references
for malformed inputs, so continue checking

In internally used methods, convert references to non-references if they're
found.
 2021-11-30 09:09:12 -05:00
Dmitry Stogov
532f2ca7ff Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix crash after indirect modification of string by user error handler
 2021-11-30 16:10:11 +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
c2aea6e805 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix incorrect reference counting inference
 2021-11-30 13:00:13 +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
517738b19b Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix uninitialized result of ASSIGN_DIM[_OP] after clobbering array by user error handler
 2021-11-30 11:42:58 +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
0d6232dc72 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Restore line, removed by mistake in b914122389
 2021-11-30 09:45:15 +03:00
Dmitry Stogov
3c3626a903 Restore line, removed by mistake in b914122389 2021-11-30 09:44:36 +03:00
Dmitry Stogov
e1baef1835 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fixed type inference (it's safe to ignore reference counting narrowing)
 2021-11-29 23:40:49 +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
8cdead1568 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix exception handling when next array element is already occupied
 2021-11-29 21:57:38 +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
c0d890e918 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix #74604: Out of bounds in php_pcre_replace_impl
 2021-11-29 19:17:49 +01: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
1b36555148 Merge branch 'PHP-8.1' 
* PHP-8.1:
  JIT: Fix named arguments handling
  JIT: Fix named arguments handling
 2021-11-29 18:43:34 +03: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