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
142550 commits 526 branches 1434 tags 865 MiB
Commit graph

497 commits

Author SHA1 Message Date
Niels Dossche
de3c5c0bc8 Silence deprecations in zend-test 
Forgot it here...
 2023-12-06 23:49:08 +01:00
Ilija Tovilo
30acbba2ca
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix leak of call->extra_named_params on internal __call
 2023-12-01 16:50:56 +01:00
Ilija Tovilo
b7a468cd06
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix leak of call->extra_named_params on internal __call
 2023-12-01 16:50:49 +01:00
Ilija Tovilo
f203edd3c5
Fix leak of call->extra_named_params on internal __call 
Fixes GH-12835
Closes GH-12836
 2023-12-01 16:49:16 +01:00
Bob Weinand
ed431065fd Merge branch 'PHP-8.3' 2023-11-25 18:49:40 +01:00
Bob Weinand
4774dc167e Merge branch 'PHP-8.2' into PHP-8.3 2023-11-25 18:49:22 +01:00
Bob Weinand
c572613596 Merge branch 'PHP-8.1' into PHP-8.2 2023-11-25 18:48:57 +01:00
Bob Weinand
d404e1d1ee USE_ZEND_ALLOC=1 in tests with zend_test.observe_opline_in_zendmm=1 2023-11-25 18:44:45 +01:00
Bob Weinand
78364ef97e Merge branch 'PHP-8.3' 2023-11-25 01:02:52 +01:00
Bob Weinand
88537c55b5 Merge branch 'PHP-8.2' into PHP-8.3 2023-11-25 01:01:56 +01:00
Bob Weinand
50ccea31f2 Merge branch 'PHP-8.1' into PHP-8.2 2023-11-25 00:59:26 +01:00
Florian Engelhardt
8d2df86b06
Fix invalid opline in OOM handlers within ZEND_FUNC_GET_ARGS and ZEND_BIND_STATIC (#12768) 
* fix segfault in `ZEND_BIND_STATIC`

In case a `ZEND_BIND_STATIC` is being executed, while the current chunk is full,
the `zend_array_dup()` call will trigger a OOM in ZendMM which will crash, as
the opline might be a dangling pointer.

* add missing test

* `assert()`ing seems easier than trying to make the compiler to not optimize

* moved from function call to INI setting, so we can use this in other places as well

* make `assert()` work no NDEBUG builds

* document magic number

* fix segfault in `ZEND_FUNC_GET_ARGS`

In case a `ZEND_FUNC_GET_ARGS` is being executed, while the current chunk is
full, the `zend_new_array()` call will trigger a OOM in ZendMM which will crash,
as the opline might be a dangling pointer.

---------

Co-authored-by: Florian Engelhardt <florian@engelhardt.tc>
 2023-11-25 00:54:02 +01:00
Niels Dossche
490b80858d Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
  Fix GH-12628: The gh11374 test fails on Alpinelinux
 2023-11-10 00:13:15 +01:00
Niels Dossche
e6fef2944b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
  Fix GH-12628: The gh11374 test fails on Alpinelinux
 2023-11-10 00:12:47 +01:00
Niels Dossche
fbda6b50a3 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
  Fix GH-12628: The gh11374 test fails on Alpinelinux
 2023-11-10 00:08:09 +01:00
Niels Dossche
78fba9cb80 Fix GH-12628: The gh11374 test fails on Alpinelinux 
Closes GH-12636.
 2023-11-10 00:01:22 +01:00
Máté Kocsis
500490ddd5
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-12558 Escape \N in generated stubs
 2023-10-31 10:11:27 +01:00
Máté Kocsis
98e8e277b5
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12558 Escape \N in generated stubs
 2023-10-31 10:09:22 +01:00
Máté Kocsis
d4e40dc0e1
Fix GH-12558 Escape \N in generated stubs (#12562) 2023-10-31 10:06:56 +01:00
Dmitry Stogov
8f8b5ba082 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix possible NULL dereference (crash on Zend/tests/arginfo_zpp_mismatch.phpt)
 2023-10-23 10:24:15 +03:00
Dmitry Stogov
25cb2a40d6 Fix possible NULL dereference (crash on Zend/tests/arginfo_zpp_mismatch.phpt) 2023-10-23 10:23:36 +03:00
Ilija Tovilo
f39b5c4c25
Close PHP tags in tests 
Closes GH-12422
 2023-10-18 17:34:10 +02:00
Ilija Tovilo
692cea5cbc
Use zend_error_noreturn for E_ERROR consistently 
To be clear, these already don't return. zend_error_noreturn just hints at this
fact through the ZEND_NORETURN attribute.

Closes GH-12204
 2023-09-14 11:44:55 +02:00
George Peter Banyard
d7273c5963 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Prevents double call to internal iterator rewind handler
  adds failing test case for #12060
 2023-09-05 10:36:16 +01:00
George Peter Banyard
c672a06954 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Prevents double call to internal iterator rewind handler
  adds failing test case for #12060
 2023-09-05 10:27:33 +01:00
ju1ius
9658d9ada4 adds failing test case for #12060 
Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-09-05 10:23:22 +01:00
Niels Dossche
0b9702c9ed Implement GH-11934: Allow to pass CData into struct and/or union fields 
Co-authored-by: KapitanOczywisty <44417092+KapitanOczywisty@users.noreply.github.com>

Closes GH-11935.
 2023-08-29 17:01:10 +02:00
Remi Collet
13d3564a51
Fix #12063 convert PHP single-quote to C double-quote string 2023-08-28 14:48:49 +02:00
Máté Kocsis
c934e24197 Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs 2023-08-26 21:35:31 +02:00
ju1ius
3e0e7e3f90
releases property attributes of internal classes (#11980) 
* adds test case for internal class property attribute

* releases property attributes of internal classes
 2023-08-24 16:07:00 +02:00
ju1ius
7f1c3bf09b
Adds support for DNF types in internal functions and properties (#11969) 
Note that this does not add support for items generated by gen_stubs,
only for items registered dynamically via the Zend API.

Closes GH-10120
 2023-08-19 00:11:06 +01:00
George Peter Banyard
82972f448f Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix various bugs related to DNF types
 2023-08-15 17:01:51 +01:00
George Peter Banyard
02a80c5b82 Fix various bugs related to DNF types 
- GH-11958: DNF types in trait properties do not get bound properly
 - GH-11883: Memory leak in zend_type_release() for non-arena allocated DNF types
 - Internal trait bound to userland class would not be arena allocated
 - Property DNF types were not properly deep copied during lazy loading

Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>
Co-authored-by: ju1ius <jules.bernable@gmail.com>
 2023-08-15 15:34:33 +01:00
George Peter Banyard
65a02f482f
ext/zend_test: Move object handler test objects to their own file (#11852) 2023-08-02 18:52:55 +01:00
Ilija Tovilo
dc368d3983
Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix zend/test arginfo stub hash
 2023-08-01 11:42:04 +02:00
Ilija Tovilo
e14421cd73
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix zend/test arginfo stub hash
 2023-08-01 11:41:46 +02:00
Ilija Tovilo
e61dbe54e9
Fix zend/test arginfo stub hash 2023-08-01 11:41:13 +02:00
Ben Ramsey
3d5f239474
Merge branch 'PHP-8.2' 2023-07-31 20:15:51 -05:00
Ben Ramsey
7ecb284926
Merge branch 'PHP-8.1' into PHP-8.2 2023-07-31 20:06:37 -05:00
Ben Ramsey
ebbccb3dc6
Merge branch 'PHP-8.0' into PHP-8.1 2023-07-31 20:01:03 -05:00
Niels Dossche
62228a2568
Disable global state test on Windows 
It looks like the config.w32 uses CHECK_HEADER_ADD_INCLUDE to add the include
path to libxml into the search path.
That doesn't happen in zend-test.
To add to the Windows trouble, libxml is statically linked in, ext/libxml can
only be built statically but ext/zend-test can be built both statically and
dynamically.
So the regression tests won't work in all possible configurations anyway on Windows.
All of this is no problem on Linux because it just uses dynamic linking
and pkg-config, without any magic.

Signed-off-by: Ben Ramsey <ramsey@php.net>
 2023-07-31 19:55:10 -05:00
Derick Rethans
193f879057 Merge branch 'PHP-8.2' 2023-07-31 20:24:25 +01:00
Derick Rethans
855dd2767a Fixed another broken merge (sorry) 2023-07-31 20:24:20 +01:00
Derick Rethans
dcc429557d Fixed artifacts from merging 2023-07-31 20:08:45 +01:00
Derick Rethans
797bd9f384 Merge branch 'PHP-8.2' 2023-07-31 20:05:28 +01:00
Derick Rethans
47a347e8b0 Merge branch 'PHP-8.1' into PHP-8.2 2023-07-31 20:05:20 +01:00
Derick Rethans
93b43ac238 Fix broken merge 2023-07-31 20:05:12 +01:00
Derick Rethans
86afbe10e2 Merge branch 'PHP-8.2' 2023-07-31 19:57:02 +01:00
Derick Rethans
deddf4692a Merge branch 'PHP-8.1' into PHP-8.2 2023-07-31 19:54:44 +01:00
Derick Rethans
0870ebb862 Merge branch 'PHP-8.0' into PHP-8.1 2023-07-31 19:53:43 +01:00