Ilija Tovilo
bc32a6bd4e
Fix syntax error in SWITCH VM
...
Closes GH-14768
2024-07-04 15:06:49 +02:00
Niels Dossche
6467655568
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix uninitialized (dummy) memory in php_strtr_array() (#14812 )
2024-07-04 13:35:53 +02:00
Niels Dossche
7b74cadf8c
Fix uninitialized (dummy) memory in php_strtr_array() ( #14812 )
...
Fixes one issue in GH-14806.
2024-07-04 13:34:33 +02:00
Peter Kokot
9c460bc65f
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
ext/standard/tests: use %d instead of bytes in an overflow message
2024-07-04 00:48:35 +02:00
Michael Orlitzky
a8d1955348
ext/standard/tests: use %d instead of bytes in an overflow message
...
In strings/chunk_split_variation1_32bit.phpt, we have a test that is
expected to fail on x32 with a possible integer overflow error. The
message reports the exact number of bytes -- a number big enough to
overflow an int on x32 -- stemming from a memory allocation in
chunk_split().
This number appears unpredictable, and is not the point of the test.
We replace it with %d to make the test independent of the allocation
details.
2024-07-04 00:48:01 +02:00
David Carlier
15bea9ed74
Fix GH-14775: range overflow on negative step.
...
overflow occurs since we only deal with positive steps.
close GH-14778
2024-07-03 18:57:25 +01:00
Arnaud Le Blanc
6b54d3b26f
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix test race condition
2024-07-03 19:17:43 +02:00
Arnaud Le Blanc
070779c874
Fix test race condition
...
Closes GH-14790
2024-07-03 19:17:13 +02:00
Go Kudo
3f08bcbdf8
Merge remote-tracking branch 'upstream/PHP-8.2' into PHP-8.3
2024-07-03 14:54:07 +09:00
Go Kudo
cd67080236
[ci skip] fix NEWS typo ( #14777 )
2024-07-03 14:53:33 +09:00
David Carlier
20866b37aa
Merge branch 'PHP-8.2' into PHP-8.3
2024-07-01 22:37:54 +01:00
David Carlier
2edf12e87f
Fix GH-14638: null dereference after XML parsing failure.
...
object document is null if the parsing had failed prior to cast to
string.
2024-07-01 22:36:32 +01:00
Peter Kokot
df37671bb9
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Use pattern tags for NDBM ext/dba/tests (#14755 )
2024-07-01 22:06:24 +02:00
Peter Kokot
98cb0be17d
Use pattern tags for NDBM ext/dba/tests ( #14755 )
2024-07-01 22:06:10 +02:00
Niels Dossche
015b5195ae
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Factor out common check for short-circuited ast
Fix OSS-Fuzz #69765 : Yield reference to nullsafe chain
2024-06-30 13:38:44 +02:00
Niels Dossche
8fd095669a
Factor out common check for short-circuited ast
2024-06-30 13:38:14 +02:00
Niels Dossche
d568337680
Fix OSS-Fuzz #69765 : Yield reference to nullsafe chain
...
You cannot return or yield a reference to a nullsafe chain. This was
checked already in zend_compile_return but not yet in
zend_compile_yield.
Closes GH-14716.
2024-06-30 13:38:06 +02:00
David Carlier
1b71a9e01f
Merge branch 'PHP-8.2' into PHP-8.3
2024-06-29 15:52:28 +01:00
David Carlier
c03196a5be
Fix GH-14712: segfault on invalid object.
...
If the extension does not allow to get a property pointer (like PDORow
object), we fallback
to the read property cb anyway.
2024-06-29 15:51:57 +01:00
Niels Dossche
b63b100e36
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-14563: Build failure with libxml2 v2.13.0
2024-06-29 16:28:51 +02:00
Niels Dossche
b08def5156
Fix GH-14563: Build failure with libxml2 v2.13.0
...
Remove xmlErrMemory from the export section for Windows, this fixes the
build. Even though the original function was renamed [1] it is hidden,
so removing this should be sufficient and not be a BC break.
[1] 130436917c
2024-06-29 16:28:16 +02:00
Niels Dossche
0a1f51deb3
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-14702: DOMDocument::xinclude() crash
2024-06-28 22:22:12 +02:00
Niels Dossche
42908f9f68
Fix GH-14702: DOMDocument::xinclude() crash
...
The xinclude code from libxml removes the fallback node,
but the fallback node is still reference via $fallback.
The solution is to detach the nodes that are going to be removed in
advance.
Closes GH-14704.
2024-06-28 22:21:12 +02:00
Niels Dossche
41371900a8
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-14590: Memory leak in FPM test gh13563-conf-bool-env.phpt
2024-06-28 22:08:18 +02:00
Niels Dossche
056bec72f4
Fix GH-14590: Memory leak in FPM test gh13563-conf-bool-env.phpt
...
Values retrieved from zend_getenv should be freed.
Note: The only possible value for `zend_getenv` is `sapi_getenv` which uses
zend alloc to duplicate the string that it reads from the SAPI module.
Closes GH-14708.
2024-06-28 22:05:15 +02:00
Niels Dossche
f97e2779b1
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[ci skip] Move incorrectly placed NEWS items to the right place
2024-06-28 20:16:45 +02:00
Niels Dossche
643762cd78
[ci skip] Move incorrectly placed NEWS items to the right place
2024-06-28 20:16:19 +02:00
Niels Dossche
c19affc567
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-14537: shmop Windows 11 crashes the process
2024-06-28 20:14:20 +02:00
Niels Dossche
39a3266576
Fix GH-14537: shmop Windows 11 crashes the process
...
The error handling code isn't entirely right in two places.
One of the code blocks is dead because of an always-false condition, and
another code block is missing the assignment of a NULL pointer.
Getting the exact same behaviour is not entirely possible because you
can't extend the size of a shared memory region after it was made with
the Windows APIs we use, unless we destroy the region and recreate it,
but that has other consequences.
However, it certainly shouldn't crash.
Closes GH-14707.
2024-06-28 20:13:47 +02:00
Niels Dossche
4794c1fc16
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Add SKIPIFs for upstream regression in libxslt (#14674 )
2024-06-26 19:36:01 +02:00
Niels Dossche
5a32b510ef
Add SKIPIFs for upstream regression in libxslt ( #14674 )
...
See https://gitlab.gnome.org/GNOME/libxslt/-/issues/113
2024-06-26 19:35:52 +02:00
Arnaud Le Blanc
a5a75ae39d
[ci skip] NEWS for GH-14626
2024-06-25 15:17:24 +02:00
Arnaud Le Blanc
bc57c77fa2
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[ci skip] NEWS for GH-14626
Fix is_zend_ptr() for huge blocks (#14626 )
2024-06-25 15:15:46 +02:00
Arnaud Le Blanc
a9acc29a37
[ci skip] NEWS for GH-14626
2024-06-25 15:15:17 +02:00
Arnaud Le Blanc
1ff277dee2
Fix is_zend_ptr() for huge blocks ( #14626 )
...
is_zend_ptr() expected zend_mm_heap.huge_list to be circular, but it's in fact NULL-terminated. It could crash when at least one huge block exists and the ptr did not belong to any block.
2024-06-25 15:14:00 +02:00
Arnaud Le Blanc
e230610c76
[ci skip] NEWS for GH-13922
2024-06-24 19:57:00 +02:00
Arnaud Le Blanc
b1119de0c9
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[ci skip] NEWS for GH-13922
Support sysconf(_SC_GETPW_R_SIZE_MAX) == -1 (#13922 )
2024-06-24 19:56:19 +02:00
Arnaud Le Blanc
d7ef2c209a
[ci skip] NEWS for GH-13922
2024-06-24 19:55:47 +02:00
Arnaud Le Blanc
3fbca7fb6a
Support sysconf(_SC_GETPW_R_SIZE_MAX) == -1 ( #13922 )
2024-06-24 19:52:55 +02:00
David Carlier
04418ede7a
Merge branch 'PHP-8.2' into PHP-8.3
2024-06-21 05:08:21 +01:00
David Carlier
686afc10bf
Fix GH-14603: invalid null zip file entry.
...
close GH-14610
2024-06-21 05:07:46 +01:00
David Carlier
19ddb5f92d
Merge branch 'PHP-8.2' into PHP-8.3
2024-06-21 05:03:30 +01:00
David Carlier
6704c60589
Fix GH-14596: phpdbg with asan and ZC_RC_DEBUG set crashes.
...
close GH-14607
2024-06-21 05:02:53 +01:00
Jakub Zelenka
387b1c62bf
PHP-8.3 is now for PHP-8.3.10-dev
2024-06-19 00:05:24 +01:00
Sergey Panteleev
70861c82df
Merge branch 'refs/heads/PHP-8.2' into PHP-8.3
...
* refs/heads/PHP-8.2:
PHP-8.2 is now for PHP 8.2.22-dev
# Conflicts:
# Zend/zend.h
# configure.ac
# main/php_version.h
2024-06-18 17:56:30 +03:00
Sergey Panteleev
49aaa7cd9f
PHP-8.2 is now for PHP 8.2.22-dev
2024-06-18 17:56:05 +03:00
David Carlier
8690d522a3
Merge branch 'PHP-8.2' into PHP-8.3
2024-06-17 17:46:24 +01:00
David Carlier
03f0776d08
Fix GH-13681: segfault when adding watchpoint fails.
...
thus when removing its entry, no watch point is set and crash on
pointer access.
close GH-14513
2024-06-17 17:45:53 +01:00
Dmitry Stogov
e842ddfe4f
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-14475: PHP 8.3.7 with JIT encounters infinite loop on specific paths (#14558 )
2024-06-17 09:38:02 +03:00
Dmitry Stogov
350af549a0
Fix GH-14475: PHP 8.3.7 with JIT encounters infinite loop on specific paths ( #14558 )
2024-06-17 09:37:44 +03:00
