Merge tag 'php-8.3.11' into was-8.3.x

Tag for php-8.3.11

Author: MaxKellermann

.github/CODEOWNERS

@@ -5,36 +5,53 @@
 # the problem area and could aid in deciding whether a pull request is ready
 # for merging.
 #
+# When changing this file, please make sure to commit the changes to the
+# earliest supported PHP branch (PHP-X.Y) and not only to the master branch.
+# GitHub reads the CODEOWNERS file from the pull request's targeted branch.
+# Commit changes here similar to bug fixes:
+# https://github.com/php/php-src/blob/master/CONTRIBUTING.md#pull-requests
+#
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 /.github @iluuu1994 @TimWolla
 /build/gen_stub.php @kocsismate
-/ext/bcmath @Girgias
+/ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
 /ext/dom @nielsdos
 /ext/ffi @dstogov
+/ext/gd @devnexen
 /ext/gettext @devnexen
 /ext/gmp @Girgias
 /ext/imap @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
 /ext/libxml @nielsdos
-/ext/mbstring @alexdowad
+/ext/mbstring @alexdowad @youkidearitai
+/ext/mysqlnd @SakiTakamachi
 /ext/odbc @NattyNarwhal
 /ext/opcache @dstogov @iluuu1994
 /ext/openssl @bukka
-/ext/pdo_odbc @NattyNarwhal
-/ext/pdo_pgsql @devnexen
+/ext/pcntl @devnexen
+/ext/pdo @SakiTakamachi
+/ext/pdo_dblib @SakiTakamachi
+/ext/pdo_firebird @SakiTakamachi
+/ext/pdo_mysql @SakiTakamachi
+/ext/pdo_odbc @NattyNarwhal @SakiTakamachi
+/ext/pdo_pgsql @devnexen @SakiTakamachi
+/ext/pdo_sqlite @SakiTakamachi
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
+/ext/simplexml @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
+/ext/xml @nielsdos
 /ext/xmlreader @nielsdos
+/ext/xmlwriter @nielsdos
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
@@ -44,6 +61,8 @@
 /Zend/zend_API.* @dstogov @iluuu1994
 /Zend/zend_call_stack.* @arnaud-lb
 /Zend/zend_closures.* @dstogov
+/Zend/zend_compile.* @iluuu1994
+/Zend/zend_enum.* @iluuu1994
 /Zend/zend_execute.* @dstogov @iluuu1994
 /Zend/zend_execute_API.c @dstogov @iluuu1994
 /Zend/zend_gc.* @dstogov @arnaud-lb

.github/actions/verify-generated-files/action.yml

@@ -12,4 +12,5 @@ runs:
         ext/tokenizer/tokenizer_data_gen.php
         build/gen_stub.php -f
         build/gen_stub.php --generate-optimizer-info
-        git add . -N && git diff --exit-code
+        # Use the -a flag for a bug in git 2.46.0, which doesn't consider changed -diff files.
+        git add . -N && git diff -a --exit-code

.github/workflows/nightly.yml

@@ -860,7 +860,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
       PHP_BUILD_CRT: vs16
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"

.github/workflows/push.yml

@@ -155,7 +155,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
     steps:
       - name: git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: apt
         uses: ./.github/actions/apt-x32
       - name: ccache
@@ -222,7 +222,7 @@ jobs:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
       PHP_BUILD_CRT: vs16
       PLATFORM: x64
       THREAD_SAFE: "1"

NEWS

@@ -1,5 +1,76 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+29 Aug 2024, PHP 8.3.11
+
+- Core:
+  . Fixed bug GH-15020 (Memory leak in Zend/Optimizer/escape_analysis.c).
+    (nielsdos)
+  . Fixed bug GH-15023 (Memory leak in Zend/zend_ini.c). (nielsdos)
+  . Fixed bug GH-13330 (Append -Wno-implicit-fallthrough flag conditionally).
+    (Peter Kokot)
+  . Fix uninitialized memory in network.c. (nielsdos)
+  . Fixed bug GH-15108 (Segfault when destroying generator during shutdown).
+    (Arnaud)
+  . Fixed bug GH-15275 (Crash during GC of suspended generator delegate).
+    (Arnaud)
+
+- Curl:
+  . Fixed case when curl_error returns an empty string.
+    (David Carlier)
+
+- DOM:
+  . Fix UAF when removing doctype and using foreach iteration. (nielsdos)
+
+- FFI:
+  . Fixed bug GH-14286 (ffi enum type (when enum has no name) make memory
+    leak). (nielsdos, dstogov)
+
+- Hash:
+  . Fix crash when converting array data for array in shm in xxh3. (nielsdos)
+
+- Intl:
+  . Fixed bug GH-15087 (IntlChar::foldCase()'s $option is not optional). (cmb)
+
+- Opcache:
+  . Fixed bug GH-13817 (Segmentation fault for enabled observers after pass 4).
+    (Bob)
+  . Fixed bug GH-13775 (Memory leak possibly related to opcache SHM placement).
+    (Arnaud, nielsdos)
+
+- Output:
+  . Fixed bug GH-15179 (Segmentation fault (null pointer dereference) in
+    ext/standard/url_scanner_ex.re). (nielsdos)
+
+- PDO_Firebird:
+  . Fix bogus fallthrough path in firebird_handle_get_attribute(). (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-13199 (EOF emits redundant prompt in phpdbg local console mode
+    with libedit/readline). (Peter Kokot)
+  . Fixed bug GH-15268 (heap buffer overflow in phpdbg
+    (zend_hash_num_elements() Zend/zend_hash.h)). (nielsdos)
+  . Fixed bug GH-15210 use-after-free on watchpoint allocations. (nielsdos)
+
+- Soap:
+  . Fixed bug #55639 (Digest autentication dont work). (nielsdos)
+  . Fix SoapFault property destruction. (nielsdos)
+  . Fixed bug GH-15252 (SOAP XML broken since PHP 8.3.9 when using classmap
+    constructor option). (nielsdos)
+
+- Standard:
+  . Fix passing non-finite timeout values in stream functions. (nielsdos)
+  . Fixed GH-14780 p(f)sockopen timeout overflow. (David Carlier)
+
+- Streams:
+  . Fixed bug GH-15028 (Memory leak in ext/phar/stream.c). (nielsdos)
+  . Fixed bug GH-15034 (Integer overflow on stream_notification_callback
+    byte_max parameter with files bigger than 2GB). (nielsdos)
+  . Reverted fix for GH-14930 (Custom stream wrapper dir_readdir output
+    truncated to 255 characters). (Jakub Zelenka)
+
+- Tidy:
+  . Fix memory leaks in ext/tidy basedir restriction code. (nielsdos)
+
 01 Aug 2024, PHP 8.3.10
 
 - Core:
@@ -12,6 +83,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-14741 (Segmentation fault in Zend/zend_types.h). (nielsdos)
   . Fixed bug GH-14969 (Use-after-free in property coercion with __toString()).
     (ilutov)
+  . Fixed bug GH-14961 (Comment between -> and keyword results in parse error).
+    (ilutov)
 
 - Dom:
   . Fixed bug GH-14702 (DOMDocument::xinclude() crash). (nielsdos)

UPGRADING

@@ -45,6 +45,9 @@ PHP 8.3 UPGRADE NOTES
     be removed during cycle collection if the key is not reachable except by
     iterating over the WeakMap (reachability via iteration is considered weak).
     Previously, such entries would never be automatically removed.
+  . In addition to whitespace characters, now comments are allowed between
+    `yield` and `from`. The whole "construct" (e.g. `yield /* comment */ from`)
+    is reported as a single `T_YIELD_FROM` token by the tokenizer.
 
 - DOM:
   . DOMChildNode::after(), DOMChildNode::before(), DOMChildNode::replaceWith()

Zend/Optimizer/compact_vars.c

@@ -18,6 +18,7 @@
 
 #include "Optimizer/zend_optimizer_internal.h"
 #include "zend_bitset.h"
+#include "zend_observer.h"
 
 /* This pass removes all CVs and temporaries that are completely unused. It does *not* merge any CVs or TMPs.
  * This pass does not operate on SSA form anymore. */
@@ -117,7 +118,7 @@ void zend_optimizer_compact_vars(zend_op_array *op_array) {
 		op_array->last_var = num_cvs;
 	}
 
-	op_array->T = num_tmps;
+	op_array->T = num_tmps + ZEND_OBSERVER_ENABLED; // reserve last temporary for observers if enabled
 
 	free_alloca(vars_map, use_heap2);
 }

Zend/Optimizer/escape_analysis.c

@@ -415,6 +415,7 @@ zend_result zend_ssa_escape_analysis(const zend_script *script, zend_op_array *o
 	}
 
 	if (zend_build_equi_escape_sets(ees, op_array, ssa) == FAILURE) {
+		free_alloca(ees, use_heap);
 		return FAILURE;
 	}
 

Zend/Optimizer/optimize_temp_vars_5.c

@@ -27,6 +27,7 @@
 #include "zend_execute.h"
 #include "zend_vm.h"
 #include "zend_bitset.h"
+#include "zend_observer.h"
 
 #define INVALID_VAR ((uint32_t)-1)
 #define GET_AVAILABLE_T()					\
@@ -174,5 +175,5 @@ void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_c
 	}
 
 	zend_arena_release(&ctx->arena, checkpoint);
-	op_array->T = max + 1;
+	op_array->T = max + 1 + ZEND_OBSERVER_ENABLED; // reserve last temporary for observers if enabled
 }

Zend/Optimizer/zend_optimizer.c

@@ -28,7 +28,6 @@
 #include "zend_dump.h" // for zend_dump_op_array()
 #include "zend_inference.h" // for OP1_INFO(), ...
 #include "zend_ini.h"
-#include "zend_observer.h"
 #include "zend_virtual_cwd.h" //for IS_ABSOLUTE_PATH()
 #include "zend_vm.h"
 
@@ -1101,8 +1100,6 @@ static void zend_revert_pass_two(zend_op_array *op_array)
 	}
 #endif
 
-	op_array->T -= ZEND_OBSERVER_ENABLED;
-
 	op_array->fn_flags &= ~ZEND_ACC_DONE_PASS_TWO;
 }
 
@@ -1132,8 +1129,6 @@ static void zend_redo_pass_two(zend_op_array *op_array)
 	}
 #endif
 
-	op_array->T += ZEND_OBSERVER_ENABLED; // reserve last temporary for observers if enabled
-
 	opline = op_array->opcodes;
 	end = opline + op_array->last;
 	while (opline < end) {
@@ -1562,12 +1557,6 @@ ZEND_API void zend_optimize_script(zend_script *script, zend_long optimization_l
 			}
 		}
 
-		if (ZEND_OBSERVER_ENABLED) {
-			for (i = 0; i < call_graph.op_arrays_count; i++) {
-				++call_graph.op_arrays[i]->T; // ensure accurate temporary count for stack size precalculation
-			}
-		}
-
 		if (ZEND_OPTIMIZER_PASS_12 & optimization_level) {
 			for (i = 0; i < call_graph.op_arrays_count; i++) {
 				zend_adjust_fcall_stack_size_graph(call_graph.op_arrays[i]);
@@ -1583,8 +1572,6 @@ ZEND_API void zend_optimize_script(zend_script *script, zend_long optimization_l
 					zend_recalc_live_ranges(op_array, needs_live_range);
 				}
 			} else {
-				op_array->T -= ZEND_OBSERVER_ENABLED; // redo_pass_two will re-increment it
-
 				zend_redo_pass_two(op_array);
 				if (op_array->live_range) {
 					zend_recalc_live_ranges(op_array, NULL);