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

Tag for php-8.3.7

Author: MaxKellermann

.circleci/config.yml

@@ -184,6 +184,8 @@ jobs:
               -d opcache.enable_cli=1 \
               -d opcache.jit_buffer_size=16M \
               -d opcache.jit=tracing \
+              -d zend_test.observer.enabled=1 \
+              -d zend_test.observer.show_output=0 \
               -P -q -x -j2 \
               -g FAIL,BORK,LEAK,XLEAK \
               --no-progress \

.github/nightly_matrix.php

@@ -72,6 +72,7 @@ function get_matrix_include(array $branches) {
                 'debug' => true,
                 'zts' => true,
                 'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
+                'run_tests_parameters' => '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0',
                 'timeout_minutes' => 360,
                 'test_function_jit' => true,
                 'asan' => false,

.github/workflows/push.yml

@@ -45,6 +45,7 @@ env:
   CXX: ccache g++
 jobs:
   LINUX_X64:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     services:
       mysql:
         image: mysql:8
@@ -137,6 +138,7 @@ jobs:
         if: ${{ !matrix.asan }}
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     runs-on: macos-12
     steps:
       - name: git checkout
@@ -170,6 +172,7 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   WINDOWS:
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     name: WINDOWS_X64_ZTS
     runs-on: windows-2019
     env:
@@ -196,7 +199,7 @@ jobs:
         run: .github/scripts/windows/test.bat
   BENCHMARKING:
     name: BENCHMARKING
-    if: github.repository_owner == 'php' || github.event_name == 'pull_request'
+    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     runs-on: ubuntu-22.04
     steps:
       - name: git checkout

NEWS

@@ -1,6 +1,90 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-11 Apr 2024, PHP 8.3.6
+09 May 2024, PHP 8.3.7
+
+- Core:
+  . Fixed zend_call_stack build with Linux/uclibc-ng without thread support.
+    (Fabrice Fontaine)
+  . Fixed bug GH-13772 (Invalid execute_data->opline pointers in observer fcall
+    handlers when JIT is enabled). (Bob)
+  . Fixed bug GH-13931 (Applying zero offset to null pointer in
+    Zend/zend_opcode.c). (nielsdos)
+  . Fixed bug GH-13942 (Align the behavior of zend-max-execution-timers with
+    other timeout implementations). (Kévin Dunglas)
+  . Fixed bug GH-14003 (Broken cleanup of unfinished calls with callable convert
+    parameters). (ilutov)
+  . Fixed bug GH-14013 (Erroneous dnl appended in configure). (Peter Kokot)
+  . Fixed bug GH-10232 (If autoloading occurs during constant resolution
+    filename and lineno are identified incorrectly). (ranvis)
+  . Fixed bug GH-13727 (Missing void keyword). (Peter Kokot)
+
+- Fibers:
+  . Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).
+    (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-13795 (Test failing in ext/fileinfo/tests/bug78987.phpt on
+    big-endian PPC). (orlitzky)
+
+- FPM:
+  . Fixed bug GH-13563 (Setting bool values via env in FPM config fails).
+    (Jakub Zelenka)
+
+- Intl:
+  . Fixed build for icu 74 and onwards. (dunglas)
+
+- MySQLnd:
+  . Fix shift out of bounds on 32-bit non-fast-path platforms. (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-13433 (Segmentation Fault in zend_class_init_statics when
+    using opcache.preload). (nielsdos)
+  . Fixed incorrect assumptions across compilation units for static calls.
+    (ilutov)
+
+- OpenSSL:
+  . Fixed bug GH-10495 (feof on OpenSSL stream hangs indefinitely).
+    (Jakub Zelenka)
+
+- PDO SQLite:
+  . Fix GH-13984 (Buffer size is now checked before memcmp). (Saki Takamachi)
+  . Fix GH-13998 (Manage refcount of agg_context->val correctly).
+    (Saki Takamachi)
+
+- Phar:
+  . Fixed bug GH-13836 (Renaming a file in a Phar to an already existing
+    filename causes a NULL pointer dereference). (nielsdos)
+  . Fixed bug GH-13833 (Applying zero offset to null pointer in zend_hash.c).
+    (nielsdos)
+  . Fix potential NULL pointer dereference before calling EVP_SignInit. (icy17)
+
+- PHPDBG:
+  . Fixed bug GH-13827 (Null pointer access of type 'zval' in phpdbg_frame).
+    (nielsdos)
+
+- Posix:
+  . Fix usage of reentrant functions in ext/posix. (Arnaud)
+
+- Session:
+  . Fixed bug GH-13856 (Member access within null pointer of type 'ps_files' in
+    ext/session/mod_files.c). (nielsdos)
+  . Fixed bug GH-13891 (memleak and segfault when using ini_set with
+    session.trans_sid_hosts). (nielsdos, kamil-tekiela)
+  . Fixed buffer _read/_write size limit on windows for the file mode. (David Carlier)
+
+- Streams:
+  . Fixed file_get_contents() on Windows fails with "errno=22 Invalid
+    argument". (Damian Wójcik)
+  . Fixed bug GH-13264 (Part 1 - Memory leak on stream filter failure).
+    (Jakub Zelenka)
+  . Fixed bug GH-13860 (Incorrect PHP_STREAM_OPTION_CHECK_LIVENESS case in
+    ext/openssl/xp_ssl.c - causing use of dead socket). (nielsdos)
+  . Fixed bug GH-11678 (Build fails on musl 1.2.4 - lfs64). (Arnaud)
+
+- Treewide:
+  . Fix gcc-14 Wcalloc-transposed-args warnings. (Cristian Rodríguez)
+
+28 Mar 2024, PHP 8.3.5RC1
 
 - Core:
   . Fixed GH-13569 (GC buffer unnecessarily grows up to GC_MAX_BUF_SIZE when
@@ -19,7 +103,7 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
     (Jakub Zelenka)
-  . Fix incorrect check in fpm_shm_free(). (nielsdos)
+  . Fixed incorrect check in fpm_shm_free(). (nielsdos)
 
 - GD:
   . Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)
@@ -65,7 +149,6 @@ PHP                                                                        NEWS
     opening ATO risk). (CVE-2024-3096) (Jakub Zelenka)
   . Fixed bug GHSA-fjp9-9hwx-59fq (mb_encode_mimeheader runs endlessly for some
     inputs). (CVE-2024-2757) (Alex Dowad)
-  . Fix bug GH-13932 (Attempt to fix mbstring on windows build) (msvc). (David Carlier)
 
 14 Mar 2024, PHP 8.3.4
 
@@ -160,7 +243,7 @@ PHP                                                                        NEWS
    (David Carlier).
 
 - PDO_Firebird:
-  . Fix GH-13119 (Changed to convert float and double values ​​into strings using
+  . Fix GH-13119 (Changed to convert float and double values into strings using
     `H` format). (SakiTakamachi)
 
 - Phar:

Zend/Optimizer/zend_inference.c

@@ -5057,6 +5057,9 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 					return 1;
 				}
 			}
+			if (t1 & (MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_REF)) {
+				return 1;
+			}
 			return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_TRUE|MAY_BE_FALSE|MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE)) || opline->op2_type == IS_UNUSED ||
 				(t2 & (MAY_BE_UNDEF|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
 		case ZEND_ASSIGN_OBJ:

Zend/tests/gh10232.phpt

@@ -0,0 +1,33 @@
+--TEST--
+GH-10232 (Weird behaviour when a file is autoloaded in assignment of a constant)
+--FILE--
+<?php
+
+set_include_path('gh10232-nonexistent') or exit(1);
+chdir(__DIR__) or exit(1);
+
+spl_autoload_register(function () {
+    trigger_error(__LINE__);
+    $ex = new Exception();
+    echo 'Exception on line ', $ex->getLine(), "\n";
+    require_once __DIR__ . '/gh10232/constant_def.inc';
+}, true);
+
+
+class ConstantRef
+{
+    public const VALUE = ConstantDef::VALUE;
+}
+
+ConstantRef::VALUE;
+
+?>
+--EXPECTF--
+Notice: 7 in %sgh10232.php on line 7
+Exception on line 8
+
+Notice: constant_def.inc in %sconstant_def.inc on line 3
+Exception in constant_def.inc on line 4
+
+Notice: required.inc in %srequired.inc on line 3
+Exception in required.inc on line 4

Zend/tests/gh10232/constant_def.inc

@@ -0,0 +1,12 @@
+<?php
+
+trigger_error(basename(__FILE__));
+$ex = new Exception();
+echo 'Exception in ', basename($ex->getFile()), ' on line ', $ex->getLine(), "\n";
+
+require_once 'required.inc'; // The script of the same directory.
+
+class ConstantDef
+{
+    const VALUE = true;
+}

Zend/tests/gh10232/required.inc

@@ -0,0 +1,5 @@
+<?php
+
+trigger_error(basename(__FILE__));
+$ex = new Exception();
+echo 'Exception in ', basename($ex->getFile()), ' on line ', $ex->getLine(), "\n";

Zend/tests/gh10346.phpt

@@ -6,6 +6,7 @@ Florian Sowade
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php

Zend/tests/gh13931.phpt

@@ -0,0 +1,23 @@
+--TEST--
+GH-13931 (Applying zero offset to null pointer in Zend/zend_opcode.c)
+--FILE--
+<?php
+
+register_shutdown_function(function() {
+	var_dump(eval("return 1+3;"));
+});
+
+eval(<<<EVAL
+function foo () {
+    try {
+        break;
+    } finally {
+    }
+}
+foo();
+EVAL);
+
+?>
+--EXPECTF--
+Fatal error: 'break' not in the 'loop' or 'switch' context in %s on line %d
+int(4)