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

17578 Commits

Author SHA1 Message Date
David CARLIER c9385ee1ad zend_mm_map_fixed using MAP_TRYFIXED on NetBSD.DragonFlyBSD
attempts to map on addr but does not replace it if already present.
Note on OpenBSD it has no effect, addr is used just as a hint.

Closes GH-7923.
2022-03-19 12:12:00 +01:00
Dmitry Stogov 6c1828775a Merge branch 'PHP-8.1'
* PHP-8.1:
  Skip test for preloading
2022-03-14 13:03:51 +03:00
Dmitry Stogov 33eec37830 Skip test for preloading 2022-03-14 13:03:21 +03:00
Dmitry Stogov d06422670c Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix memory leak
2022-03-14 12:59:13 +03:00
Dmitry Stogov 156d3aedc1 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-03-14 12:58:11 +03:00
Dmitry Stogov efb014dda2 Reset EG(filename_override) after fatal error
Fixes oss-fuzz #45492
2022-03-14 11:07:49 +03:00
Dmitry Stogov df14a07887 Merge branch 'PHP-8.1'
* PHP-8.1:
  Optimizer: Fix inorrect constant substitution in FETCH_LIST_R
2022-03-11 14:31:32 +03:00
Dmitry Stogov 770a544af4 Optimizer: Fix inorrect constant substitution in FETCH_LIST_R
Fixes oss-fuzz #45429
2022-03-11 14:30:27 +03:00
Dmitry Stogov bf079d0515 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed memory leak
2022-03-11 11:33:32 +03:00
Dmitry Stogov 1f5562aa09 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed memory leak
2022-03-11 11:33:01 +03:00
Dmitry Stogov bfedb4ea91 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix non-reentirant startiong or error recording from error handler
2022-03-11 10:52:13 +03:00
Dmitry Stogov c6a53f9499 Fix non-reentirant startiong or error recording from error handler
Fixes oss-fuzz #45398
2022-03-11 10:50:31 +03:00
Ilija Tovilo e3ef7bbbb8 Adjust filename/lineno for constant expressions
Closes GH-7771
Closes GH-8124
2022-03-09 18:41:04 +01:00
Bob Weinand e6bdf980eb Put packed back to attribute iterating after merge 2022-03-07 22:32:01 +01:00
Bob Weinand e439736fdf Merge branch 'PHP-8.1' 2022-03-07 22:30:03 +01:00
Bob Weinand 67b372e287 Merge branch 'PHP-8.0' into PHP-8.1 2022-03-07 22:25:52 +01:00
Bob Weinand 15949b61ba Fix ZTS build after cherry-pick 2022-03-07 22:24:55 +01:00
Bob Weinand 185a14685d Merge branch 'PHP-8.1' 2022-03-07 22:17:35 +01:00
Bob Weinand a44d99fe23 Merge branch 'PHP-8.0' into PHP-8.1 2022-03-07 22:06:58 +01:00
Tim Düsterhus 0d7e10c1a9 Fix memory leak of function attribute hash table (#8070)
==109253== 280 (56 direct, 224 indirect) bytes in 1 blocks are definitely lost in loss record 4 of 4
    ==109253==    at 0x483B7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
    ==109253==    by 0x6D9FA2: __zend_malloc (zend_alloc.c:3068)
    ==109253==    by 0x745138: zend_add_attribute (zend_attributes.c:226)
    ==109253==    by 0x6680D1: zend_add_parameter_attribute (zend_attributes.h:102)
    ==109253==    by 0x66B787: zm_startup_zend_test (test.c:478)
    ==109253==    by 0x7224CD: zend_startup_module_ex (zend_API.c:2202)
    ==109253==    by 0x72252C: zend_startup_module_zval (zend_API.c:2217)
    ==109253==    by 0x734288: zend_hash_apply (zend_hash.c:2011)
    ==109253==    by 0x722C30: zend_startup_modules (zend_API.c:2328)
    ==109253==    by 0x67409B: php_module_startup (main.c:2256)
    ==109253==    by 0x88EDDE: php_cli_startup (php_cli.c:409)
    ==109253==    by 0x890F61: main (php_cli.c:1334)
2022-03-07 22:05:40 +01:00
Bob Weinand f095d2c91b Fix freeing of internal attribute arguments 2022-03-07 22:04:16 +01:00
Bob Weinand c414c5f946 Merge branch 'PHP-8.1' 2022-03-07 18:27:43 +01:00
Bob Weinand cbbf3502a2 Fix GH-8176: Fix leaking enum values in property initializers 2022-03-07 18:26:46 +01:00
Patrick Allaert 67440096c5 Added: [zend_]memory_reset_peak_usage() (#8151) 2022-03-04 13:24:08 +01:00
Patrick Allaert 723058c3bf Bump for 8.1.5-dev 2022-03-02 17:38:22 +01:00
Bob Weinand 0e88f749ff Merge branch 'PHP-8.1' 2022-03-01 14:55:09 +01:00
Bob Weinand 85b669e565 Merge branch 'PHP-8.0' into PHP-8.1 2022-03-01 14:54:09 +01:00
Bob Weinand e6cf583160 Fix GH-8082: Prevent leaking memory on observed transient run_time_caches
This is achieved by tracking the observers on the run_time_cache (with a fixed amount of slots, 2 for each observer).
That way round, if the run_time_cache is freed all associated observer data is as well.

This approach has been chosen, as to avoid any ABI or API breakage.
Future versions may for example choose to provide a hookable API for run_time_cache freeing or similar.
2022-03-01 14:49:44 +01:00
Dmitry Stogov 83d96d6779 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix use after free
2022-03-01 01:34:27 +03:00
Dmitry Stogov ba6bb8579a Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix use after free
2022-03-01 01:34:17 +03:00
Dmitry Stogov 01702a851b Fix use after free
Fixes oss-fuzz #44885
2022-03-01 01:33:22 +03:00
Dmitry Stogov 486d654b7d Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix typr inference
2022-02-28 18:26:37 +03:00
Dmitry Stogov aced867a95 Fix typr inference
Fixes oss-fuzz #45020
2022-02-28 18:25:49 +03:00
Dmitry Stogov 5ca2dd3d16 Fixed assertion after clobbering object by user error handler, because
of creation dynamic property deprecation warning.

Fixes oss-fuzz #44932
2022-02-28 16:37:17 +03:00
Dmitry Stogov 36ce177e5e Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed incorrect DCE for FREE
2022-02-28 11:54:34 +03:00
Dmitry Stogov 56d7672d56 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed incorrect DCE for FREE
2022-02-28 11:54:25 +03:00
Patrick Allaert 8c60e21515 Avoid possible [-Wstrict-prototypes] build warnings 2022-02-24 16:14:47 +01:00
Patrick Allaert 67dd48fbd5 fix [-Wstrict-prototypes] buid warnings 2022-02-24 15:44:09 +01:00
Christoph M. Becker bf32299184 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix GH-8140: Wrong first class callable by name optimization
2022-02-24 10:37:34 +01:00
Christoph M. Becker 33cd61c904 Fix GH-8140: Wrong first class callable by name optimization
When optimizing by name function calls, we must not replace
`CALLABLE_CONVERT` opcodes, but have to keep them.

Closes GH-8144.
2022-02-24 10:35:53 +01:00
Christoph M. Becker 3be34c3b95 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix GH-8074: Wrong type inference of range() result
2022-02-22 10:21:07 +01:00
Christoph M. Becker 7ea3b19331 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix GH-8074: Wrong type inference of range() result
2022-02-22 10:20:13 +01:00
Christoph M. Becker 18f158723b Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix GH-7958: Nested CallbackFilterIterator is leaking memory
2022-02-21 12:39:59 +01:00
Christoph M. Becker fb70460d8e Fix GH-7958: Nested CallbackFilterIterator is leaking memory
We implement `zend_object_iterator_funcs.get_gc` for user iterators to
avoid the memory leak.

Closes GH-8107.
2022-02-21 12:39:07 +01:00
Ilija Tovilo 7d8e3da32f Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix null static_variable_ptr for uncalled fake closures
2022-02-19 11:46:52 +01:00
Ilija Tovilo 19063a84f0 Fix null static_variable_ptr for uncalled fake closures
Closes GH-8083
Closes GH-8109
2022-02-19 11:37:52 +01:00
Dmitry Stogov 90e4d5456b Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix memory leak
2022-02-18 12:21:48 +03:00
Dmitry Stogov 22328f68aa Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-02-18 12:21:15 +03:00
Dmitry Stogov 84a638a346 Fix memory leak
Fixes oss-fuzz #44685
2022-02-18 12:20:40 +03:00
Dmitry Stogov ace00faddd Merge branch 'PHP-8.1'
* PHP-8.1:
  Disable ASSIGN optimization for values inferred for fatal errors.
2022-02-18 11:38:16 +03:00