1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Commit Graph

136169 Commits

Author SHA1 Message Date
Niels Dossche
983be089c0 Fix GH-20722: Null pointer dereference in DOM namespace node cloning via clone on malformed objects
Closes GH-20730.
2025-12-18 22:39:35 +01:00
Tim Düsterhus
7c1830b056 Update GitHub Action workflows to actions/checkout@v6 (8.3) 2025-12-17 15:21:31 +01:00
Tim Düsterhus
d076ca39ff Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update GitHub Action workflows to `actions/checkout@v6` (8.2)
  Update GitHub Action workflows to `actions/cache@v5`
  Update GitHub Action workflows to `actions/checkout@v6`
2025-12-17 15:21:16 +01:00
Tim Düsterhus
61c35928fa Update GitHub Action workflows to actions/checkout@v6 (8.2) 2025-12-17 15:19:38 +01:00
Tim Düsterhus
0b5d0504b4 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update GitHub Action workflows to `actions/cache@v5`
  Update GitHub Action workflows to `actions/checkout@v6`
2025-12-17 15:18:22 +01:00
Tim Düsterhus
6f61244a03 Update GitHub Action workflows to actions/cache@v5
Keep this up to date in all nonbranches, because the node.js runtime for older
versions might get deprecated in the future and fixing this for all branches at
once is easier.

see 2650248a92
2025-12-17 14:00:56 +01:00
Tim Düsterhus
bb70c5589a Update GitHub Action workflows to actions/checkout@v6
Keep this up to date in all nonbranches, because the node.js runtime for older
versions might get deprecated in the future and fixing this for all branches at
once is easier.

see 2650248a92
2025-12-17 14:00:10 +01:00
Pierrick Charron
d92fa57a78 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  PHP-8.2 is now for PHP 8.2.31-dev
2025-12-17 07:48:54 -05:00
Pierrick Charron
6836c230ed PHP-8.2 is now for PHP 8.2.31-dev 2025-12-16 12:42:07 -05:00
Ilija Tovilo
fb1ec9a5a7 Fix uncatchable exception thrown in generator
This procedure may be called during i_free_compiled_variables(), when
EG(current_execute_data) is unfortunately already reset to the parent frame.
EG(opline_before_exception) does not actually belong to this frame. Furthermore,
setting opline to EG(exception_op) early will miss a later
zend_rethrow_exception(), which will also miss installation of the correct
EG(opline_before_exception).

Fixes GH-20714
Closes GH-20716
2025-12-16 17:30:05 +01:00
Jakub Zelenka
e776695abf Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update NEWS with info about security issues
  Fix GHSA-www2-q4fc-65wf
  Fix GHSA-h96m-rvf9-jgm2
  Fix GHSA-8xr5-qppj-gvwj: PDO quoting result null deref
  Fix GH-20584: Information Leak of Memory
2025-12-16 15:34:19 +01:00
Jakub Zelenka
6e124d0df6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update NEWS with info about security issues
  Fix GHSA-www2-q4fc-65wf
  Fix GHSA-h96m-rvf9-jgm2
  Fix GHSA-8xr5-qppj-gvwj: PDO quoting result null deref
  Fix GH-20584: Information Leak of Memory
2025-12-16 15:30:54 +01:00
Jakub Zelenka
c48a9f42d3 Update NEWS with info about security issues 2025-12-16 15:26:59 +01:00
Niels Dossche
ed70b1ea43 Fix GHSA-www2-q4fc-65wf 2025-12-16 15:26:59 +01:00
Niels Dossche
8b801151bd Fix GHSA-h96m-rvf9-jgm2 2025-12-16 15:26:59 +01:00
Jakub Zelenka
727a4ddc39 Fix GHSA-8xr5-qppj-gvwj: PDO quoting result null deref 2025-12-16 15:26:59 +01:00
Niels Dossche
c5f28c7cf0 Fix GH-20584: Information Leak of Memory
The string added had uninitialized memory due to
php_read_stream_all_chunks() not moving the buffer position, resulting
in the same data always being overwritten instead of new data being
added to the end of the buffer.

This is backport as there is a security impact as described in
GHSA-3237-qqm7-mfv7 .
2025-12-16 15:26:58 +01:00
Ilija Tovilo
aaae117157 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix curl protocols test expectation
2025-12-15 23:52:00 +01:00
Ilija Tovilo
06b8b75d2e Fix curl protocols test expectation
Closes GH-17803

(cherry picked from commit 5b87faaaa7)
2025-12-15 23:51:48 +01:00
Niels Dossche
85cb6e421a Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
I think there's simply a reasoning error about when which scanner state
can cause which parser component to invoke later on.

Closes GH-20702.
2025-12-15 22:46:27 +01:00
Niels Dossche
8ffedc873a Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Make bug70417.phpt less flaky
2025-12-15 08:14:56 +01:00
Niels Dossche
2c4163c90c Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Make bug70417.phpt less flaky
2025-12-15 08:14:48 +01:00
Niels Dossche
2bf2411976 Make bug70417.phpt less flaky
Closes GH-20287.

(cherry picked from commit ed9529a7d3)
2025-12-15 08:14:41 +01:00
Yuya Hamada
0056d013bf Fix GH-20674 mb_decode_mimeheader does not handle separator
`?=  =?` is skipped if long term, so skip space character.
Add test case from RFC2047 and fix last pattern
See: https://www.ietf.org/rfc/rfc2047#section-8
2025-12-15 10:55:17 +09:00
Niels Dossche
802ad3c6a4 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:31:00 +01:00
Niels Dossche
4d28e2af9e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:30:54 +01:00
Max Kellermann
5850c7de7c sapi/fpm: remove use of variable-length arrays (#10645)
According to @cmb69, PHP does not require VLA support
(https://github.com/php/php-src/pull/10304#discussion_r1069343092).
VLAs are a bad idea for several reasons, so let's get rid of them.

Two of the VLAs were probably unintended; unlike C++, C doesn't have
the concept of "constant expressions", so an array with a "const"
length is technically still a VLA.  This is fixed by removing the
"const" variable, and using sizeof() instead.

(cherry picked from commit ff2a211d55)
2025-12-14 23:30:37 +01:00
Niels Dossche
acd0898bdf Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
Closes GH-20701.
2025-12-14 23:17:31 +01:00
Kamil Tekiela
dbf56e0eba Squashed commit of the following:
commit c4adcbe582
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 15:32:14 2025 +0100

    Add NEWS

commit 84a6e675af
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 14:49:26 2025 +0100

    Handle errors in mysqli_begin_transaction
2025-12-14 15:25:34 +00:00
David Carlier
97a90f4361 Fix GH-20678: resource created by GlobIterator crashes with fclose().
close GH-20697
2025-12-14 11:58:18 +00:00
Ilija Tovilo
b37a6e73b1 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix xcode-select
2025-12-13 20:30:03 +01:00
Ilija Tovilo
9bd587801d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix xcode-select
2025-12-13 20:29:56 +01:00
Ilija Tovilo
6cdb8bf0a2 Fix xcode-select
The old Xcode sticks around, so make sure we sort in reverse to pick the newer
version. Technically we should use something like sort -Vr, but -V doesn't exist
on macOS. But that won't be a problem until Xcode 100, which my great great
grand children can worry about.
2025-12-13 20:27:14 +01:00
Niels Dossche
038e53420b standard: Fix error check for proc_open() command
zval_get_string() can never return NULL, you need to use the try version
to get NULL. This is observable because the process will still spawn
even if an exception had occurred. To fix this, use the try variant.

Closes GH-20650.
2025-12-13 11:57:54 +01:00
Ilija Tovilo
4969ef195b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update clang in macOS build
2025-12-08 23:10:56 +01:00
Ilija Tovilo
4022ea11b8 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update clang in macOS build
2025-12-08 23:10:51 +01:00
Ilija Tovilo
cb413b5d5f Update clang in macOS build
This resolves a crash in release builds. This may be dropped again in the
future once the bugfix lands.

Co-authored by Alexandre Daubois <alex.daubois@gmail.com>
Co-authored by Arnaud Le Blanc <arnaud.lb@gmail.com>
Co-authored by Jakub Zelenka <bukka@php.net>

Closes GH-20669
2025-12-08 23:10:26 +01:00
Niels Dossche
02a7c49564 ldap: Fix memory leak in ldap_set_options()
Closes GH-20659.
2025-12-08 22:29:03 +01:00
Ilija Tovilo
26c0cbd93c Fix dumping function signature with dynamic class const lookup default argument
Fixes OSS-Fuzz #465488618
Closes GH-20651
2025-12-08 16:19:06 +01:00
David Carlier
1f1147a666 Fix GH-20620: bzcompress() overflow on large source size.
close GH-20621
2025-12-05 22:30:51 +00:00
David Carlier
9f654decdc Fix GH-20622: imagestring/imagestringup overflow/underflow.
close GH-20623
2025-12-04 23:13:29 +00:00
Alexandre Daubois
77f2d12849 Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373) 2025-12-04 09:09:30 +01:00
Niels Dossche
a960edc077 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  xml: Fix deprecation properly by backporting the modern-but-actually-old implementation
2025-12-03 22:17:07 +01:00
Niels Dossche
d635c8788b xml: Fix deprecation properly by backporting the modern-but-actually-old implementation 2025-12-03 22:16:54 +01:00
David Carlier
ff51ac161d Fix GH-20603 issue on windows 32 bits.
the timeout needed to be unsigned.

close GH-20634
2025-12-03 20:22:14 +00:00
Ilija Tovilo
0106134bb9 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix yet another xml deprecation
2025-12-03 14:53:02 +01:00
Ilija Tovilo
fe070fcc75 Fix yet another xml deprecation 2025-12-03 14:51:52 +01:00
Niels Dossche
4b63315ad5 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  intl: Fix tests for icu update
2025-12-02 20:59:41 +01:00
Niels Dossche
667b28cba4 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  intl: Fix tests for icu update
2025-12-02 20:59:34 +01:00
Niels Dossche
2b04e0831a intl: Fix tests for icu update 2025-12-02 20:59:26 +01:00