archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
134175 commits 526 branches 1434 tags 865 MiB
Commit graph

4734 commits

Author SHA1 Message Date
Ilija Tovilo
a5833577d7
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix in-place modification of filename in php_message_handler_for_zend
 2023-11-20 14:13:12 +01:00
Ilija Tovilo
05a815399e
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix in-place modification of filename in php_message_handler_for_zend
 2023-11-20 14:13:06 +01:00
Ilija Tovilo
d8e866da04
Fix in-place modification of filename in php_message_handler_for_zend 
php_strip_url_passwd modifies url in-place. We cannot assume from
php_message_handler_for_zend that data is a temporary, modifiable string.

Fixes oss-fuzz #64209
Closes GH-12733
 2023-11-20 14:12:25 +01:00
Ilija Tovilo
e0a6dbcbf4
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix use-after-free of name in var-var with malicious error handler
 2023-11-20 14:06:40 +01:00
Ilija Tovilo
88d012f360
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix use-after-free of name in var-var with malicious error handler
 2023-11-20 14:06:25 +01:00
Ilija Tovilo
ea52706a2a
Fix use-after-free of name in var-var with malicious error handler 
Fixes oss-fuzz #54325
Closes GH-12732
 2023-11-20 14:05:46 +01:00
Arnaud Le Blanc
8f424dd36b
Test that objects free handler call zend_weakrefs_notify (#12546) 2023-11-11 13:53:35 +01:00
Ilija Tovilo
9ba9b8f874
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix OP1 leak in error path of post inc/dec
 2023-11-02 19:32:02 +01:00
Ilija Tovilo
ddabe89add
Fix OP1 leak in error path of post inc/dec 
Fixes oss-fuzz #63802
Closes GH-12599
 2023-11-02 19:30:59 +01:00
Dmitry Stogov
f27090cbc2 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fixed GH-12564: The negative fiber.stack_size setting leads to crash
 2023-11-01 16:28:50 +03:00
Dmitry Stogov
032a293ac2 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed GH-12564: The negative fiber.stack_size setting leads to crash
 2023-11-01 16:28:42 +03:00
Dmitry Stogov
9096ba9917 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed GH-12564: The negative fiber.stack_size setting leads to crash
 2023-11-01 16:26:32 +03:00
Dmitry Stogov
fe3a819e32 Fixed GH-12564: The negative fiber.stack_size setting leads to crash 2023-11-01 16:13:17 +03:00
Dmitry Stogov
b7c34b7ff9 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix memory leak after GC inside a foreach loop (#12572)
 2023-10-30 23:37:03 +03:00
Dmitry Stogov
004d8951ce Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix memory leak after GC inside a foreach loop (#12572)
 2023-10-30 23:36:50 +03:00
Dmitry Stogov
d906d8b5ea Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix memory leak after GC inside a foreach loop (#12572)
 2023-10-30 23:36:41 +03:00
Dmitry Stogov
abe3673d1f
Fix memory leak after GC inside a foreach loop (#12572) 
Fixes oss-fuzz #54515
 2023-10-30 23:36:12 +03:00
Julien Desrosiers
226b92b1dc
Nested match expression tests 
Closes GH-12433
 2023-10-23 08:18:17 +02:00
Ilija Tovilo
f39b0292bf
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix double-free of doc_comment when overriding static property via trait
 2023-10-19 15:23:34 +02:00
Ilija Tovilo
8347740c8c
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix double-free of doc_comment when overriding static property via trait
 2023-10-19 15:23:26 +02:00
Ilija Tovilo
4f1f77c51b
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix double-free of doc_comment when overriding static property via trait
 2023-10-19 15:23:00 +02:00
Ilija Tovilo
af3d2f7ec9
Fix double-free of doc_comment when overriding static property via trait 
When redeclaring an overridden static property with a trait we're removing the
property from the class. However, because the property itself does not belong to
the class we must not free its associated data.

This issue is exposed by 9a250cc9d6 in PHP 8.3+ because duplicate static
properties in traits are no longer skipped, but redeclared.

Fixes GH-12468
 2023-10-19 15:21:53 +02:00
Ilija Tovilo
f39b5c4c25
Close PHP tags in tests 
Closes GH-12422
 2023-10-18 17:34:10 +02:00
Ilija Tovilo
0de79a8f5a
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed a bug in zend_memnistr with single character needle
 2023-10-18 16:02:19 +02:00
SakiTakamachi
736032febf
Fixed a bug in zend_memnistr with single character needle 
Fixes GH-12457
Closes GH-12458
 2023-10-18 16:00:49 +02:00
Ilija Tovilo
2e6d34c72e
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix use-after-free of constant name
 2023-10-11 11:52:11 +02:00
Ilija Tovilo
53dbb760da
Fix use-after-free of constant name 
The constant name is usually interend. Without opcache, compilation always
interns strings. Without opcache, compilation does not intern (new) strings, but
persisting of script does. If a script is not stored in shm the constant name
will not be interned.

The building of enum backing stores was missing a addref for the constant name,
leading to a double-free when releasing constants and backing stores of enums.

Fixes GH-12366
Closes GH-12405
 2023-10-11 11:49:40 +02:00
Ilija Tovilo
4ba5699903
Fix invalid returned opcode for memoized expressions 
Closes GH-12345
 2023-10-03 14:01:43 +02:00
David Carlier
639bcb4078 Merge branch 'PHP-8.2' into PHP-8.3 2023-09-18 17:46:28 +01:00
David Carlier
c39d4481c5 Merge branch 'PHP-8.1' into PHP-8.2 2023-09-18 17:46:11 +01:00
Florian Sowade
910f579f14 Fix GH-12207 memory leak of doc blocks of static properties 
When declaring the same static property with a doc block in a class and in a trait,
the doc block of the property in the class is leaked. While at it, possibly fix doc
 comment for internal classes.

Close GH-12238
 2023-09-18 17:44:47 +01:00
George Peter Banyard
0b614a6c2b
Fixed oss-fuzz #62294: Unsetting variable after ++/-- on string variable warning 
Closes GH-12202
 2023-09-17 15:49:46 +01:00
Tim Düsterhus
d344fe06a2
Fix #[Override] on traits overriding a parent method without a matching interface (#12205) 
Fixes GH-12189

Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>
 2023-09-15 14:57:10 +02:00
Tim Düsterhus
0e9d658dd2
Add abstract __construct() test for #[\Override] (024.phpt) 2023-09-14 12:58:08 +02:00
Ilija Tovilo
011071a3b3
Improve invalid cpp modifier message 
The ZEND_MODIFIER_TARGET_CPP should really have been called _PARAM, but we
shouldn't break API at this point.

Fixes GH-12069
Closes GH-12175
 2023-09-11 16:23:43 +02:00
Ilija Tovilo
214afe0d96
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Skip arginfo_zpp_mismatch on asan
 2023-09-11 11:36:22 +02:00
Ilija Tovilo
1c93cdcea4
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Skip arginfo_zpp_mismatch on asan
 2023-09-11 11:35:51 +02:00
Ilija Tovilo
5286bab392
[skip ci] Skip arginfo_zpp_mismatch on asan 
These tests intermittently crash asan. It might be due to some function invoking
dl(), which is known to crash lsan. It might also be something else, the version
of asan shipped with ubuntu 22.04 is flaky.
 2023-09-11 11:32:34 +02:00
Ilija Tovilo
c2bb9bc0df
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix zend_separate_if_call_and_write for FUNC_ARGs
 2023-09-07 14:26:09 +02:00
Ilija Tovilo
fa9cef8b47
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix zend_separate_if_call_and_write for FUNC_ARGs
 2023-09-07 14:25:43 +02:00
Ilija Tovilo
748adf18fc
Fix zend_separate_if_call_and_write for FUNC_ARGs 
Fixes GH-12102
Closees GH-12140
 2023-09-07 14:25:11 +02:00
George Peter Banyard
8a392eddf9 Fix OSS Fuzz #61865: Undef variable in ++/-- for declared property that is unset in error handler 
Reorder when we assign the property value to NULL which is identical to
a3a3964497

Just for the declared property case instead of dynamic.

Closes GH-12114
 2023-09-05 10:40:02 +01:00
Ilija Tovilo
baf74ed1a4
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix freeing of incompletely initialized closures
 2023-09-04 15:39:39 +02:00
Ilija Tovilo
6850a040f3
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix freeing of incompletely initialized closures
 2023-09-04 15:39:20 +02:00
Ilija Tovilo
af2110e664
Fix freeing of incompletely initialized closures 
Addref to relevant fields before allocating any memory. Also only set/remove the
ZEND_ACC_HEAP_RT_CACHE flag after allocating memory.

Fixes GH-12073
Closes GH-12074
 2023-09-04 15:35:39 +02:00
Niels Dossche
eee1617f38 Tweak behaviour of dynamic properties wrt error handlers 
With the fix in https://github.com/php/php-src/pull/12114, the behaviour
would change for non-dynamic properties. Align the behaviour for dynamic
properties to be the same.

Closes GH-12117.
 2023-09-03 18:27:21 +02:00
George Peter Banyard
013bb5769b Add tests for oss-fuzz-61469: Undef dynamic property in ++/-- unset in error handler 
This was fixed as a consequence of a3a3964497

Closes GH-12011
 2023-09-02 23:34:20 +01:00
Remi Collet
1f2cfd8009
ensure displays_errors is off (default) 2023-08-31 14:55:17 +02:00
George Peter Banyard
9b28e521d1 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-11876: ini_parse_quantity() accepts invalid quantities
 2023-08-30 21:23:10 +01:00
George Peter Banyard
d229a480ad Fix GH-11876: ini_parse_quantity() accepts invalid quantities 
Closes GH-11910
 2023-08-30 21:22:13 +01:00