php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 17:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
130,759 Commits 547 Branches 1,483 Tags
php-8.2.6
Commit Graph

4517 Commits

Author SHA1 Message Date
Ilija Tovilo
8340d75d17 Endless recursion when using + on array in foreach 
This reverts commit 84b4020eb4.

Fixes GH-11171
 2023-05-01 09:21:04 -04:00
nielsdos
7300659391 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Set error_log to an empty value if the test relies on that feature
 2023-04-24 23:23:45 +02:00
Niels Dossche
691ff9f845 Set error_log to an empty value if the test relies on that feature 
Some tests fail if the error_log is overriden by the loaded ini
configuration. Explicitly set it to an empty value to prevent the
failures.
See https://github.com/php/php-src/issues/10737#issuecomment-1452899299

Closes GH-10772.
 2023-04-24 23:19:15 +02:00
Ilija Tovilo
439919c91d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix incorrect CG(memoize_mode) state after bailout in ??=
 2023-04-20 19:46:05 +02:00
Ilija Tovilo
4c38a79f09 Fix incorrect CG(memoize_mode) state after bailout in ??= 
Fixes GH-11108
Closes GH-11109
 2023-04-20 19:45:02 +02:00
Ilija Tovilo
b2282bee32 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix reference returned from CallbackFilterIterator::accept()
 2023-04-20 13:43:20 +02:00
Ilija Tovilo
5855bdcd6c Fix reference returned from CallbackFilterIterator::accept() 
Fixes oss-fuzz #58181
 2023-04-20 10:18:18 +02:00
Ilija Tovilo
35c1bb2e47 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Support enums in array_unique
 2023-04-16 15:35:55 +02:00
Ilija Tovilo
e8b8341d3d Support enums in array_unique 
Fixes GH-9775
Closes GH-11015
 2023-04-16 15:34:56 +02:00
Jakub Zelenka
9a20f43b94 Merge branch 'PHP-8.1' into PHP-8.2 2023-04-15 21:29:11 +01:00
Jakub Zelenka
0ac55e9bfb Add zend_test_crash funtion to segfault PHP process 
This is useful for testing PHP-FPM handling of crashed children.

Closes GH-11082
 2023-04-15 21:25:02 +01:00
Niels Dossche
1799327356 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11028: Heap Buffer Overflow in zval_undefined_cv.
 2023-04-15 18:30:47 +02:00
Niels Dossche
fc32d39b7f Fix GH-11028: Heap Buffer Overflow in zval_undefined_cv. 
For analysis see https://github.com/php/php-src/issues/11028#issuecomment-1508460440

Closes GH-11083.
 2023-04-15 18:22:55 +02:00
Ilija Tovilo
c4f56c5099 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix add_function_array() assertion when op2 contains op1
 2023-04-03 12:49:33 +02:00
Ilija Tovilo
84b4020eb4 Fix add_function_array() assertion when op2 contains op1 
Fixes GH-10085
Closes GH-10975
Co-authored-by: Dmitry Stogov <dmitry@zend.com>
 2023-04-03 12:48:46 +02:00
Niels Dossche
0d12b3db64 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10990: mail() throws TypeError after iterating over $additional_headers array by reference
  Fix GH-8841: php-cli core dump calling a badly formed function
 2023-04-01 20:04:48 +02:00
Niels Dossche
cf9b030a57 Fix GH-8841: php-cli core dump calling a badly formed function 
It's actually not php-cli specific, nor SAPI specific.
We should delay the registration of the function into the function table
until after the compilation was successful, otherwise the function is
mistakingly registered and a NULL dereference will happen when trying to
call it.

I based my test of Nikita's test, so credits to him for the test:
https://github.com/php/php-src/pull/8933#issuecomment-1259881008

Closes GH-10989.
 2023-04-01 19:43:09 +02:00
Ilija Tovilo
ed80a7e8c9 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Unary minus const expression consistency
 2023-03-31 14:28:25 +02:00
Ilija Tovilo
41bbb116dd Unary minus const expression consistency 
- of 0.0 should result in -0.0

Closes GH-10978
 2023-03-31 14:27:54 +02:00
Ilija Tovilo
3d8107f74c Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  By-ref modification of typed and readonly props through ArrayIterator
 2023-03-25 16:23:48 +01:00
Ilija Tovilo
9aaa5cd093 By-ref modification of typed and readonly props through ArrayIterator 
Fixes GH-10844
Closes GH-10872
 2023-03-25 16:14:19 +01:00
Ilija Tovilo
c0bb5b0b67 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix NUL byte in exception string terminating Exception::__toString()
 2023-03-19 10:50:39 +01:00
Ilija Tovilo
b5726c2cb1 Fix NUL byte in exception string terminating Exception::__toString() 
Fixes GH-10810
Closes GH-10873
 2023-03-19 10:48:26 +01:00
Kamil Tekiela
e223bf2015 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix strlen error message param name
 2023-03-10 12:48:46 +00:00
Kamil Tekiela
ad705afc2f Merge branch 'Fix-strlen-error-message-param-name' into PHP-8.1 
* Fix-strlen-error-message-param-name:
  Fix strlen error message param name
 2023-03-10 12:47:40 +00:00
Ilija Tovilo
1978a7b393 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10709: UAF in recursive AST evaluation
 2023-03-06 14:58:25 +01:00
Ilija Tovilo
7202fe16b7 Fix GH-10709: UAF in recursive AST evaluation 
Fixes https://oss-fuzz.com/testcase-detail/6445949468934144
Closes GH-10718
 2023-03-06 14:55:34 +01:00
Kamil Tekiela
1be99faeff Fix strlen error message param name 2023-03-04 23:25:42 +00:00
Ilija Tovilo
9b10b65e2b Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10570: Assertion `(key)->h != 0 && "Hash must be known"' failed.
 2023-02-24 20:41:40 +01:00
Niels Dossche
b9a5bfc355 Fix GH-10570: Assertion `(key)->h != 0 && "Hash must be known"' failed. 
Fixes GH-10570, see GH-10570 for analysis.

Closes GH-10572
 2023-02-24 20:40:29 +01:00
Ilija Tovilo
efb9181a98 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Revert "Fix GH-10168: heap-buffer-overflow at zval_undefined_cv"
 2023-02-16 14:13:17 +01:00
Ilija Tovilo
7b68ff46da Revert "Fix GH-10168: heap-buffer-overflow at zval_undefined_cv" 
This reverts commit 71ddede565.
 2023-02-16 14:07:17 +01:00
Bob Weinand
98b8d1c152 Merge branch 'PHP-8.1' into PHP-8.2 2023-02-13 16:34:19 +00:00
Bob Weinand
95016138a5 Fix GH-10496: Fibers must not be garbage collected while implicitly suspended by resumption of another fiber 2023-02-13 16:30:21 +00:00
Bob Weinand
0e31e03bc5 Merge branch 'PHP-8.1' into PHP-8.2 2023-02-13 13:10:08 +01:00
Arnaud Le Blanc
d721dcc2ef Fix colletion of unfinished function call in fibers 
Fixes GH-10496.

Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
 2023-02-13 13:09:04 +01:00
Ilija Tovilo
b9d1eca8fd Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Mark test as XFAIL
 2023-02-11 00:21:59 +01:00
Ilija Tovilo
13c34aac05 Mark test as XFAIL 
See https://github.com/php/php-src/pull/10546
 2023-02-11 00:21:01 +01:00
Ilija Tovilo
972a5a02bd Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10168: heap-buffer-overflow at zval_undefined_cv
 2023-02-08 01:12:03 +01:00
Niels Dossche
71ddede565 Fix GH-10168: heap-buffer-overflow at zval_undefined_cv 
The problem is that we're using the variable_ptr in the opcode handler
*after* it has already been destroyed. The solution is to create a
specialised version of zend_assign_to_variable which takes in two
destination zval pointers.

Closes GH-10524
 2023-02-08 01:06:50 +01:00
Bob Weinand
f732486c08 Merge branch 'PHP-8.1' into PHP-8.2 2023-01-30 12:33:06 +01:00
Bob Weinand
00be6e1aed Look at executing generator for fiber destructor behaviour 2023-01-30 12:32:53 +01:00
Bob Weinand
e746b89bc9 Merge branch 'PHP-8.1' into PHP-8.2 2023-01-30 12:13:41 +01:00
Bob Weinand
b9bca2dadb Fix resetting ZEND_GENERATOR_IN_FIBER flag 
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2023-01-30 12:13:07 +01:00
Aaron Piotrowski
0c4aee464a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10437: Set active fiber to null on bailout (#10443)
 2023-01-28 10:16:04 -06:00
Aaron Piotrowski
284c29328e Fix GH-10437: Set active fiber to null on bailout (#10443) 2023-01-28 10:13:58 -06:00
Arnaud Le Blanc
6c22dea3c1 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [ci skip] NEWS
  Fix overflow check in OnUpdateMemoryConsumption (#10456)
  Prevent dtor of generator in suspended fiber (#10462)
 2023-01-27 19:37:01 +01:00
Arnaud Le Blanc
1173c2e64a Prevent dtor of generator in suspended fiber (#10462) 
Generators that suspended a fiber should not be dtor because they will be
executed during the fiber dtor.

Fiber dtor throws an exception in the fiber's context in order to unwind and
execute finally blocks, which will also properly dtor the generator.

Fixes GH-9916
 2023-01-27 19:32:25 +01:00
Arnaud Le Blanc
ab2097df48 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Handle non-INDIRECT symbol table entries in zend_fiber_object_gc() (#10386)
 2023-01-27 10:55:30 +01:00
Arnaud Le Blanc
9830204213 Handle non-INDIRECT symbol table entries in zend_fiber_object_gc() (#10386) 
Fixes GH-10340
 2023-01-27 10:52:42 +01:00