archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
133616 commits 526 branches 1434 tags 862 MiB
Commit graph

18709 commits

Author SHA1 Message Date
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
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
Dmitry Stogov
9717e9fd56 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed empty array inference
 2023-11-08 22:04:09 +03:00
Dmitry Stogov
5a77870492 Fixed empty array inference 2023-11-08 22:03:42 +03:00
Sergey Panteleev
239a26fa90
PHP-8.2 is now for PHP 8.2.14-dev 2023-11-07 17:12:19 +03:00
Ilija Tovilo
cb1e842929
Fix inference of COPY_TMP 
Since GH-11592 COPY_TMP may receive and thus define references. Unfortunately,
the name COPY_TMP is no longer accurate.

Closes GH-12619
 2023-11-07 12:02:45 +01:00
Niels Dossche
85cb081661 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix unspecified behaviour in zend_alloc in heap->limit computation
 2023-11-06 19:46:57 +01:00
Niels Dossche
7ac9578e41 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix unspecified behaviour in zend_alloc in heap->limit computation
 2023-11-06 19:44:33 +01:00
Niels Dossche
28110f8d0a Fix unspecified behaviour in zend_alloc in heap->limit computation 
Right-shifting a negative number is unspecified (i.e.
implementation-defined) behaviour [1]. If we take a look at the
generated assembly [2], we see that the wrong value is computed.
Fix it by using Z_UL instead of Z_L.

While we're at it, just change every occurrence of this pattern to use
Z_UL instead of casting.

[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf §6.5.7.5
[2] https://godbolt.org/z/4Y1qKKjsh

Closes GH-12613.
 2023-11-06 19:43:55 +01:00
Jakub Zelenka
52b13f6ddb
Merge branch 'PHP-8.2' into PHP-8.3 2023-11-03 17:17:52 +00:00
Jakub Zelenka
882cc4f804
Merge branch 'PHP-8.1' into PHP-8.2 2023-11-03 17:17:23 +00:00
Jakub Zelenka
a8c6c6165b
Fix GH-9921: Loading ext in FPM config does not register module handlers 
Closes GH-12377
 2023-11-03 16:53:09 +00:00
Dmitry Stogov
86f71e51d4 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Remove spaces
 2023-11-03 10:58:32 +03:00
Dmitry Stogov
7e5fb564d6 Remove spaces 2023-11-03 10:58:20 +03:00
Dmitry Stogov
4ee72a8dda Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591)
 2023-11-03 10:55:33 +03:00
Dmitry Stogov
6bf4041398 Backport fix for HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag (#12591) 
* Fixed HASH/PACKED array inference through MAY_BE_ARRAY_EMPTY flag

This fixes GH-12527

* typo
 2023-11-03 10:54:57 +03: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
22735b3ff5 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
  ext/intl: change when the locale is invalid for the 8.1/8.2 serie.
 2023-11-02 08:15:50 +03:00
Dmitry Stogov
177a6f5d8a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT
 2023-11-02 08:11:00 +03:00
Dmitry Stogov
798b9d097b Fixed GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT 2023-11-02 08:09:29 +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
916fa73d80 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed inorrect QM_ASSIGN elimination
 2023-11-01 09:55:37 +03:00
Dmitry Stogov
125dbb2c03 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed inorrect QM_ASSIGN elimination
 2023-11-01 09:55:28 +03:00
Dmitry Stogov
19dfe05f16 Fixed inorrect QM_ASSIGN elimination 
Fixes oss-fuzz #63771
 2023-11-01 09:54:58 +03:00
Dmitry Stogov
76112a15ae Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Backport implementation of iterative Pearce's SCC finding algoritm (#12528)
 2023-10-31 09:59:47 +03:00
Dmitry Stogov
00352429ca Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Backport implementation of iterative Pearce's SCC finding algoritm (#12528)
 2023-10-31 09:59:31 +03:00
Dmitry Stogov
52bb39e661 Backport implementation of iterative Pearce's SCC finding algoritm (#12528) 
Fixes GH-11795
 2023-10-31 09:54:44 +03:00
Dmitry Stogov
586b2f8645 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed GH-12511: Use must be in next opline assertion with patched infection
 2023-10-31 07:52:46 +03:00
Dmitry Stogov
14b36c8583 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed GH-12511: Use must be in next opline assertion with patched infection
 2023-10-31 07:52:38 +03:00
Dmitry Stogov
b3b46a44c5 Fixed GH-12511: Use must be in next opline assertion with patched infection 2023-10-31 07:51:36 +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
Niels Dossche
f3d60a166d Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix memory leak in error path of zend_register_list_destructors_ex
 2023-10-29 21:47:35 +01:00
Niels Dossche
1ca574f84a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix memory leak in error path of zend_register_list_destructors_ex
 2023-10-29 21:47:23 +01:00
Niels Dossche
3bf5d89efb Fix memory leak in error path of zend_register_list_destructors_ex 2023-10-29 21:47:07 +01:00
Arnaud Le Blanc
f59f7c3b94 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  fix: don't delete an unitialized timer (#12537)
 2023-10-29 12:24:59 +01:00
Arnaud Le Blanc
f918c7e200 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
  fix: don't delete an unitialized timer (#12537)
 2023-10-29 12:20:15 +01:00
Kévin Dunglas
39f3374be5
fix: don't delete an unitialized timer (#12537) 2023-10-29 12:17:48 +01:00
Dmitry Stogov
e52d617934 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed GH-12509: JIT assertion when running php-parser tests
 2023-10-26 23:59:12 +03:00
Dmitry Stogov
770c1b0361 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed GH-12509: JIT assertion when running php-parser tests
 2023-10-26 23:59:03 +03:00
Dmitry Stogov
5f46d86955 Fixed GH-12509: JIT assertion when running php-parser tests 2023-10-26 23:58:29 +03:00
Dmitry Stogov
574b0573ac Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fixed incorrect type inference
 2023-10-24 18:49:18 +03:00
Dmitry Stogov
7320f33f7f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed incorrect type inference
 2023-10-24 18:48:58 +03:00
Dmitry Stogov
aa45df4849 Fixed incorrect type inference 2023-10-24 18:48:29 +03: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