Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix GH-10627: mb_convert_encoding crashes PHP on Windows
  ext/mbstring: fix new_value length check

Author: Girgias

NEWS

@@ -41,6 +41,10 @@ PHP                                                                        NEWS
   . Fixed JSON scanner and parser generation build.
     (Daniel Black, Jakub Zelenka)
 
+- MBString:
+  . ext/mbstring: fix new_value length check. (Max Kellermann)
+  . Fix bug GH-10627 (mb_convert_encoding crashes PHP on Windows). (nielsdos)
+
 - Opcache:
   . Fix incorrect page_size check. (nielsdos)
 
@@ -83,7 +87,7 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #81744 (Password_verify() always return true with some hash).
     (CVE-2023-0567). (Tim Düsterhus)
-  . Fixed bug #81746 (1-byte array overrun in common path resolve code). 
+  . Fixed bug #81746 (1-byte array overrun in common path resolve code).
     (CVE-2023-0568). (Niels Dossche)
 
 - SAPI:

ext/mbstring/mbstring.c

@@ -761,7 +761,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
 		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_input is deprecated");
 	}
 
-	if (!new_value || !ZSTR_VAL(new_value)) {
+	if (!new_value || !ZSTR_LEN(new_value)) {
 		const char *encoding = php_get_input_encoding();
 		MBSTRG(http_input_set) = 0;
 		_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
@@ -2617,15 +2617,27 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons
 	ZEND_HASH_FOREACH_KEY_VAL(input, idx, key, entry) {
 		/* convert key */
 		if (key) {
-			key = php_mb_convert_encoding(ZSTR_VAL(key), ZSTR_LEN(key), to_encoding, from_encodings, num_from_encodings);
+			zend_string *converted_key = php_mb_convert_encoding(ZSTR_VAL(key), ZSTR_LEN(key), to_encoding, from_encodings, num_from_encodings);
+			if (!converted_key) {
+				continue;
+			}
+			key = converted_key;
 		}
 		/* convert value */
 		ZEND_ASSERT(entry);
 try_again:
 		switch(Z_TYPE_P(entry)) {
-			case IS_STRING:
-				ZVAL_STR(&entry_tmp, php_mb_convert_encoding(Z_STRVAL_P(entry), Z_STRLEN_P(entry), to_encoding, from_encodings, num_from_encodings));
+			case IS_STRING: {
+				zend_string *converted_key = php_mb_convert_encoding(Z_STRVAL_P(entry), Z_STRLEN_P(entry), to_encoding, from_encodings, num_from_encodings);
+				if (!converted_key) {
+					if (key) {
+						zend_string_release(key);
+					}
+					continue;
+				}
+				ZVAL_STR(&entry_tmp, converted_key);
 				break;
+			}
 			case IS_NULL:
 			case IS_TRUE:
 			case IS_FALSE:

ext/mbstring/tests/gh10627.phpt

@@ -0,0 +1,26 @@
+--TEST--
+GH-10627 (mb_convert_encoding crashes PHP on Windows)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+
+$str = 'Sökinställningar';
+$data = [$str, 'abc'];
+var_dump(mb_convert_encoding($data, 'UTF-8', 'auto'));
+$data = [$str => 'abc', 'abc' => 'def'];
+var_dump(mb_convert_encoding($data, 'UTF-8', 'auto'));
+
+?>
+--EXPECTF--
+Warning: mb_convert_encoding(): Unable to detect character encoding in %s on line %d
+array(1) {
+  [1]=>
+  string(3) "abc"
+}
+
+Warning: mb_convert_encoding(): Unable to detect character encoding in %s on line %d
+array(1) {
+  ["abc"]=>
+  string(3) "def"
+}