feedback

Author: LamentXU123

NEWS

@@ -52,7 +52,8 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed setlocale() to reject locale names containing NUL bytes instead of
     silently truncating them, and to reject arrays passed after the $locales
-    argument. (Weilin Du)
+    argument or additional arguments passed after an array $locales argument.
+    (Weilin Du)
 
 - Streams:
   . Added a new IO copy API used by php_stream_copy_to_stream_ex() that

UPGRADING

@@ -204,8 +204,9 @@ PHP 8.6 UPGRADE NOTES
   . setlocale() now raises a ValueError when a locale name contains NUL bytes,
     instead of silently truncating it.
     Arrays are now accepted only for the $locales argument. Passing an array as
-    a later variadic locale argument now throws a TypeError; if $locales is an
-    array, only that array is processed.
+    a later variadic locale argument now throws a TypeError. Passing any
+    additional locale arguments when $locales is an array now throws an
+    ArgumentCountError.
   . linkinfo() now raises a ValueError when the $path argument is empty.
   . pathinfo() now raises a ValueError when an invalid $flag argument value is
     passed.

ext/standard/string.c

@@ -4903,14 +4903,14 @@ static zend_string *try_setlocale_str(zend_long cat, zend_string *loc) {
 	return zend_string_init(retval, strlen(retval), 0);
 }
 
-static zend_string *try_setlocale_zval(zend_long cat, zval *loc_zv, uint32_t arg_num) {
+static zend_string *try_setlocale_zval(zend_long cat, zval *loc_zv) {
 	zend_string *tmp_loc_str;
 	zend_string *loc_str = zval_try_get_tmp_string(loc_zv, &tmp_loc_str);
 	if (UNEXPECTED(loc_str == NULL)) {
 		return NULL;
 	}
 	if (zend_str_has_nul_byte(loc_str)) {
-		zend_argument_value_error(arg_num, "must not contain any null bytes");
+		zend_argument_value_error(2, "must not contain any null bytes");
 		zend_tmp_string_release(tmp_loc_str);
 		return NULL;
 	}
@@ -4940,6 +4940,12 @@ PHP_FUNCTION(setlocale)
 				zend_wrong_parameter_type_error(i + 2, Z_EXPECTED_STRING_OR_NULL, &args[i]);
 				goto out;
 			}
+			if (UNEXPECTED(num_args > 1)) {
+				zend_argument_count_error(
+					"setlocale() expects exactly 2 arguments when argument #2 ($locales) is an array, %d given",
+					ZEND_NUM_ARGS());
+				goto out;
+			}
 			num_args = 1;
 			break;
 		}
@@ -4959,7 +4965,7 @@ PHP_FUNCTION(setlocale)
 		if (Z_TYPE(args[i]) == IS_ARRAY) {
 			zval *elem;
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL(args[i]), elem) {
-				result = try_setlocale_zval(cat, elem, i + 2);
+				result = try_setlocale_zval(cat, elem);
 				if (EG(exception)) {
 					goto out;
 				}

ext/standard/tests/strings/setlocale_null_byte.phpt

@@ -44,13 +44,17 @@ try {
     echo $e::class, ": ", $e->getMessage(), \PHP_EOL;
 }
 
-var_dump(setlocale(LC_ALL, [], new NullByteStringable()));
+try {
+    var_dump(setlocale(LC_ALL, [], new NullByteStringable()));
+} catch (ArgumentCountError $e) {
+    echo $e::class, ": ", $e->getMessage(), \PHP_EOL;
+}
 ?>
 --EXPECT--
 ValueError: setlocale(): Argument #2 ($locales) must not contain any null bytes
 ValueError: setlocale(): Argument #2 ($locales) must not contain any null bytes
 ValueError: setlocale(): Argument #2 ($locales) must not contain any null bytes
 ValueError: setlocale(): Argument #2 ($locales) must not contain any null bytes
-TypeError: setlocale(): Argument #3 must be of type ?string, array given
+TypeError: setlocale(): Argument #3 must be of type array|string|null, int given
 ValueError: setlocale(): Argument #3 must not contain any null bytes
-bool(false)
+ArgumentCountError: setlocale() expects exactly 2 arguments when argument #2 ($locales) is an array, 3 given