php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,389 Commits 549 Branches 1,485 Tags
4ef300ff5ee309394e78bd92d6cb9cd47cf4195a
Commit Graph

61242 Commits

Author SHA1 Message Date
Christoph M. Becker 4ef300ff5e Fix #81726: phar wrapper: DOS when using quine gzip file 
The phar wrapper needs to uncompress the file; the uncompressed file
might be compressed, so the wrapper implementation loops. This raises
potential DOS issues regarding too deep or even infinite recursion (the
latter are called compressed file quines[1]). We avoid that by
introducing a recursion limit; we choose the somewhat arbitrary limit
`3`.

This issue has been reported by real_as3617 and gPayl0ad.

[1] <https://honno.dev/gzip-quine/>
 2022-09-28 10:56:48 +02:00
Michael Voříšek 7fd14eb08b Fix oci_success_with_info.phpt test random failures 
Closes GH-9525.
 2022-09-13 17:15:36 +02:00
Christoph M. Becker cd927ef634 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Always skip randomly failing OCI8 extauth tests
 2022-09-13 14:25:11 +02:00
Michael Voříšek 9a73ec0367 Always skip randomly failing OCI8 extauth tests 
This might be caused by an issue with the Oracle Instant Client
libraries[1]; we skip the tests for the time being.

[1] <https://github.com/php/php-src/pull/9524#issuecomment-1244409815>

Closes GH-9524.
 2022-09-13 14:21:23 +02:00
George Peter Banyard 71e198be25 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 12:45:42 +01:00
George Peter Banyard 47500f3300 Fix GH-9421 Incorrect argument number for ValueError in NumberFormatter 
Closes GH-9489
 2022-09-13 12:42:58 +01:00
George Peter Banyard 3d5df064ca Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 11:33:09 +01:00
George Peter Banyard 293e69179d Fix GH-9308 GMP throws the wrong error when a GMP object is passed to gmp_init() 
Closes GH-9490
 2022-09-13 11:24:19 +01:00
Arnaud Le Blanc 466e4dc2a2 Check return value of zend_jit_trace_get_exit_addr() (#9097) 2022-09-09 10:50:03 +02:00
Ilija Tovilo f8d62b4c4b Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
 2022-09-08 15:57:53 +02:00
Ilija Tovilo 4a8cca241f Skip oci tests that leak under asan 2022-09-08 15:56:13 +02:00
Ilija Tovilo aa7f4497bf Fix undefined left shift in oci 
The bit is shifted into the signed bit which is undefined. Make the
integer explicitly unsigned before shifting.
 2022-09-08 15:56:10 +02:00
Ilija Tovilo a795f3ebc6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Private method incorrectly marked as "overwrites" in reflection
 2022-09-08 10:44:13 +02:00
Ilija Tovilo 1435fc6262 Private method incorrectly marked as "overwrites" in reflection 
Fix GH-9409
Closes GH-9469
 2022-09-08 10:43:25 +02:00
Christoph M. Becker b5cad508fe Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9411: PgSQL large object resource is incorrectly closed
 2022-09-05 17:26:13 +02:00
Yurun 6ac3f7c84d Fix GH-9411: PgSQL large object resource is incorrectly closed 
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-9411.
 2022-09-05 16:37:54 +02:00
Máté Kocsis 59180b50b3 Fix inexistent skipif.inc 2022-09-05 12:37:53 +02:00
Dmitry Stogov c852e0fff9 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix type inference
 2022-09-05 12:56:34 +03:00
Dmitry Stogov 81cb005ef7 Fix type inference 
Fixes oss-fuzz #50792
 2022-09-05 12:55:50 +03:00
Arnaud Le Blanc 409baac29c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  [ci skip] NEWS
  Add tests
  Fix GH-8932: Provide a way to get the called-scope of closures (#9299)
 2022-09-02 13:53:14 +02:00
Arnaud Le Blanc db1ef97209 Add tests 2022-09-02 13:33:21 +02:00
Nicolas Grekas 93f11d8429 Fix GH-8932: Provide a way to get the called-scope of closures (#9299) 
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
 2022-09-02 13:32:50 +02:00
Ilija Tovilo 2cfb028e22 Fix class name FQN when AST dumping new and class const 
Fixes GH-9447
Closes GH-9462
 2022-09-02 08:57:26 +02:00
Niklas Keller f8b217a345 Fix pcre.jit on Apple Silicon 
This backports https://github.com/zherczeg/sljit/pull/105. Relates to bug #80435, however, it doesn't solve the bus error on PHP 8.0, but PHP 8.1 builds fine now.

Closes GH-9279.
 2022-08-31 14:22:44 +02:00
Christoph M. Becker 65619e868c Fix tests 
These changes have been overlooked, when 7908aae30c
had been reverted.
 2022-08-30 16:52:33 +02:00
Ben Ramsey 1862152145 Revert "Fix GH-9296: ksort behaves incorrectly on arrays with mixed keys" 
This reverts commit cd1aed8edd, as
discussed on internals (<https://externals.io/message/118483>).
 2022-08-30 09:13:46 -05:00
Dmitry Stogov 4845d7026a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  typo
 2022-08-29 17:13:16 +03:00
Dmitry Stogov 263a07e5b0 typo 2022-08-29 17:12:57 +03:00
Dmitry Stogov 172ac0a48d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak
 2022-08-29 14:54:40 +03:00
Dmitry Stogov 4135e6011c Fix memory leak 
Fixes oss-fuzz #50616
 2022-08-29 14:53:48 +03:00
Christoph M. Becker 725cb4e8ad Revert "Fix GH-9296: ksort behaves incorrectly on arrays with mixed keys" 
This reverts commit cd1aed8edd, as
discussed on internals (<https://externals.io/message/118483>).
 2022-08-29 12:41:36 +02:00
Dmitry Stogov a516e2992d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90
 2022-08-29 12:35:46 +03:00
Dmitry Stogov ce42dcf483 Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90 
This should fix GH-9445
 2022-08-29 12:30:14 +03:00
Christoph M. Becker 2bd58dbcc4 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix pdo_dblib ext test conflicts when run in parallel
 2022-08-26 14:59:08 +02:00
Michael Voříšek f86629569c Fix pdo_dblib ext test conflicts when run in parallel 
Closes GH-9430.
 2022-08-26 14:57:13 +02:00
Christoph M. Becker 502c630d01 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix oci8/pdo_oci random test failures when run in parallel
 2022-08-25 15:21:52 +02:00
Michael Voříšek be4dd60c55 Fix oci8/pdo_oci random test failures when run in parallel 
Closes GH-9424.
 2022-08-25 15:20:50 +02:00
Christoph M. Becker afc5ab4531 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  xmlRelaxNGCleanupTypes() is deprecated as of libxml2 2.10.0
 2022-08-25 15:11:41 +02:00
Christoph M. Becker f59754694e xmlRelaxNGCleanupTypes() is deprecated as of libxml2 2.10.0 
The documentation[1] suggest to call `xmlCleanupParser()` instead, but
we are not doing that for reasons[2].  Thus, we do no longer call
`xmlRelaxNGCleanupTypes()` for libxml2 ≥ 2.10.0.

[1] <https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-relaxng.html#xmlRelaxNGCleanupTypes>
[2] <https://github.com/php/php-src/commit/8742276eb3905eb97a585417000c7b8df85006d4>

Closes GH-9417.
 2022-08-25 15:10:30 +02:00
Michael Voříšek 2db2cab6ad Fix pdo_oci tests for PHP 8.1 
Closes GH-9051
 2022-08-24 14:39:45 +02:00
Dmitry Stogov 95befc786a Fix type inference 
Fixes oss-fuzz #50272
 2022-08-22 21:11:39 +03:00
Dmitry Stogov 2a33280ceb Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Make code generation to be consistent with register allocation
 2022-08-22 19:55:10 +03:00
Dmitry Stogov fd74ee7e90 JIT: Make code generation to be consistent with register allocation 
Fixes ext/opcache/tests/jit/add_014.phpt with opcache.jit=1205
 2022-08-22 19:53:33 +03:00
Dmitry Stogov 5762fc52c6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Tracing JIT: Fix incorrect guard elimination
 2022-08-22 15:39:47 +03:00
Dmitry Stogov c9c51eb1f1 Tracing JIT: Fix incorrect guard elimination 
Fixes oss-fuzz #49917
 2022-08-22 15:38:41 +03:00
Máté Kocsis 3e0f144b2c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix pdo_oci tests for PHP 8.0
 2022-08-22 09:28:29 +02:00
Michael Voříšek 305892580e Fix pdo_oci tests for PHP 8.0 2022-08-22 09:25:43 +02:00
Christoph M. Becker 9bd9e9a867 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #79451: DOMDocument->replaceChild on doctype causes double free
 2022-08-19 18:13:48 +02:00
NathanFreeman 6027d441c1 Fix #79451: DOMDocument->replaceChild on doctype causes double free 
We have to reset intSubset if replacing doctype with another doctype node.

Closes GH-9201.
Closes GH-9376.
 2022-08-19 18:10:06 +02:00
David Carlier 9360cd6add Merge branch 'PHP-8.0' into PHP-8.1 2022-08-19 16:40:54 +01:00