Merge remote-tracking branch 'origin/master' into asan_zend_alloc

Author: danog

NEWS

@@ -148,6 +148,9 @@ PHP                                                                        NEWS
     has a wrong return type. (David Carlier)
   . Added Pdo_Sqlite::ATTR_BUSY_STATEMENT constant to check
     if a statement is currently executing. (David Carlier)
+  . Added Pdo_Sqlite::ATTR_EXPLAIN_STATEMENT constant to set a statement
+    in either EXPLAIN_MODE_PREPARED, EXPLAIN_MODE_EXPLAIN,
+    EXPLAIN_MODE_EXPLAIN_QUERY_PLAN modes. (David Carlier)
 
 - PGSQL:
   . Added pg_close_stmt to close a prepared statement while allowing
@@ -237,12 +240,18 @@ PHP                                                                        NEWS
   . Fix overall theorical overflows on zend_string buffer allocations.
     (David Carlier/nielsdos)
 
+- Sqlite:
+  . Added Sqlite3Stmt::busy to check if a statement is still being executed.
+    (David Carlier)
+
 - Standard:
   . Fixed crypt() tests on musl when using --with-external-libcrypt
     (Michael Orlitzky).
   . Fixed bug GH-18062 (is_callable(func(...), callable_name: $name) for first
     class callables returns wrong name). (timwolla)
   . Added array_first() and array_last(). (nielsdos)
+  . Fixed bug GH-18823 (setlocale's 2nd and 3rd argument ignores strict_types).
+    (nielsdos)
 
 - Streams:
   . Fixed bug GH-16889 (stream_select() timeout useless for pipes on Windows).

UPGRADING

@@ -198,6 +198,9 @@ PHP 8.5 UPGRADE NOTES
 
 - PDO_Sqlite:
   . Added class constant Pdo_Sqlite::ATTR_BUSY_STATEMENT.
+  . Added class constants Pdo_Sqlite::ATTR_EXPLAIN_STATEMENT,
+    Pdo_Sqlite::EXPLAIN_MODE_PREPARED, Pdo_Sqlite::EXPLAIN_MODE_EXPLAIN,
+    Pdo_Sqlite::EXPLAIN_MODE_EXPLAIN_QUERY_PLAN.
 
 - SOAP:
   . Enumeration cases are now dumped in __getTypes().
@@ -390,6 +393,10 @@ PHP 8.5 UPGRADE NOTES
   . ReflectionConstant::getAttributes() was introduced.
     RFC: https://wiki.php.net/rfc/attributes-on-constants
 
+- Sqlite:
+  . Sqlite3Stmt::busy to check if a statement had been fetched
+    but not completely.
+
 - Standard:
   . Added array_first() and array_last().
     RFC: https://wiki.php.net/rfc/array_first_last

Zend/zend_operators.c

@@ -2024,7 +2024,7 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval
 			ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(ZEND_CONCAT);
 			op2_string = zval_try_get_string_func(op2);
 			if (UNEXPECTED(!op2_string)) {
-				zend_string_release(op1_string);
+				zend_string_release_ex(op1_string, false);
 				if (orig_op1 != result) {
 					ZVAL_UNDEF(result);
 				}
@@ -2069,8 +2069,8 @@ has_op2_string:;
 		uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(op1_string, op2_string);
 
 		if (UNEXPECTED(op1_len > ZSTR_MAX_LEN - op2_len)) {
-			if (free_op1_string) zend_string_release(op1_string);
-			if (free_op2_string) zend_string_release(op2_string);
+			if (free_op1_string) zend_string_release_ex(op1_string, false);
+			if (free_op2_string) zend_string_release_ex(op2_string, false);
 			zend_throw_error(NULL, "String size overflow");
 			if (orig_op1 != result) {
 				ZVAL_UNDEF(result);
@@ -2093,7 +2093,7 @@ has_op2_string:;
 			/* account for the case where result_str == op1_string == op2_string and the realloc is done */
 			if (op1_string == op2_string) {
 				if (free_op2_string) {
-					zend_string_release(op2_string);
+					zend_string_release_ex(op2_string, false);
 					free_op2_string = false;
 				}
 				op2_string = result_str;
@@ -2112,8 +2112,8 @@ has_op2_string:;
 		ZSTR_VAL(result_str)[result_len] = '\0';
 	}
 
-	if (free_op1_string) zend_string_release(op1_string);
-	if (free_op2_string) zend_string_release(op2_string);
+	if (free_op1_string) zend_string_release_ex(op1_string, false);
+	if (free_op2_string) zend_string_release_ex(op2_string, false);
 
 	return SUCCESS;
 }

ext/curl/share.c

@@ -160,9 +160,7 @@ PHP_FUNCTION(curl_share_init_persistent)
 	}
 
 	ZEND_HASH_FOREACH_VAL(share_opts, zval *entry) {
-		ZVAL_DEREF(entry);
-
-		bool failed = false;
+		bool failed;
 		zend_ulong option = zval_try_get_long(entry, &failed);
 
 		if (failed) {

ext/hash/hash_xxhash.c

@@ -158,7 +158,7 @@ const php_hash_ops php_hash_xxh3_64_ops = {
 typedef XXH_errorcode (*xxh3_reset_with_secret_func_t)(XXH3_state_t*, const void*, size_t);
 typedef XXH_errorcode (*xxh3_reset_with_seed_func_t)(XXH3_state_t*, XXH64_hash_t);
 
-zend_always_inline static void _PHP_XXH3_Init(PHP_XXH3_64_CTX *ctx, HashTable *args,
+static void _PHP_XXH3_Init(PHP_XXH3_64_CTX *ctx, HashTable *args,
 		xxh3_reset_with_seed_func_t func_init_seed, xxh3_reset_with_secret_func_t func_init_secret, const char* algo_name)
 {
 	memset(&ctx->s, 0, sizeof ctx->s);

ext/hash/xxhash/xxhash.h

@@ -931,7 +931,7 @@ XXH_PUBLIC_API int XXH128_cmp(const void* h128_1, const void* h128_2);
 
 /*******   Canonical representation   *******/
 typedef struct { unsigned char digest[sizeof(XXH128_hash_t)]; } XXH128_canonical_t;
-XXH_PUBLIC_API void XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash);
+static zend_always_inline void XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash);
 XXH_PUBLIC_API XXH128_hash_t XXH128_hashFromCanonical(const XXH128_canonical_t* src);
 
 
@@ -5503,7 +5503,7 @@ XXH_PUBLIC_API int XXH128_cmp(const void* h128_1, const void* h128_2)
 
 /*======   Canonical representation   ======*/
 /*! @ingroup xxh3_family */
-XXH_PUBLIC_API void
+static zend_always_inline void
 XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash)
 {
     XXH_STATIC_ASSERT(sizeof(XXH128_canonical_t) == sizeof(XXH128_hash_t));

Zend/tests/pipe_operator/optimizations.phpt renamed to ext/opcache/tests/pipe_optimizations.phpt

@@ -35,7 +35,7 @@ var_dump($res1);
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=18, args=0, vars=2, tmps=2)
+     ; (lines=18, args=0, vars=2, tmps=%d)
      ; (after optimizer)
      ; %s:1-27
 0000 V2 = NEW 0 string("Other")
@@ -61,7 +61,7 @@ LIVE RANGES:
      2: 0010 - 0011 (tmp/var)
 
 _test1:
-     ; (lines=4, args=1, vars=1, tmps=1)
+     ; (lines=4, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s:3-5
 0000 CV0($a) = RECV 1
@@ -70,7 +70,7 @@ _test1:
 0003 RETURN T1
 
 Other::foo:
-     ; (lines=4, args=1, vars=1, tmps=1)
+     ; (lines=4, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s:8-10
 0000 CV0($a) = RECV 1
@@ -79,7 +79,7 @@ Other::foo:
 0003 RETURN T1
 
 Other::bar:
-     ; (lines=4, args=1, vars=1, tmps=1)
+     ; (lines=4, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s:12-14
 0000 CV0($a) = RECV 1

ext/pdo_sqlite/pdo_sqlite.stub.php

@@ -36,6 +36,15 @@ class Sqlite extends \PDO
     /** @cvalue PDO_SQLITE_ATTR_BUSY_STATEMENT */
     public const int ATTR_BUSY_STATEMENT = UNKNOWN;
 
+    /** @cvalue PDO_SQLITE_ATTR_EXPLAIN_STATEMENT */
+    public const int ATTR_EXPLAIN_STATEMENT = UNKNOWN;
+
+#if SQLITE_VERSION_NUMBER >= 3041000
+    public const int EXPLAIN_MODE_PREPARED = 0;
+    public const int EXPLAIN_MODE_EXPLAIN = 1;
+    public const int EXPLAIN_MODE_EXPLAIN_QUERY_PLAN = 2;
+#endif
+
     /** @cvalue SQLITE_OK */
     public const int OK = UNKNOWN;
 

ext/pdo_sqlite/pdo_sqlite_arginfo.h

@@ -74,7 +74,8 @@ enum {
 	PDO_SQLITE_ATTR_OPEN_FLAGS = PDO_ATTR_DRIVER_SPECIFIC,
 	PDO_SQLITE_ATTR_READONLY_STATEMENT,
 	PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES,
-	PDO_SQLITE_ATTR_BUSY_STATEMENT
+	PDO_SQLITE_ATTR_BUSY_STATEMENT,
+	PDO_SQLITE_ATTR_EXPLAIN_STATEMENT
 };
 
 typedef int pdo_sqlite_create_collation_callback(void*, int, const void*, int, const void*);