Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #81011: mb_convert_encoding removes references from arrays

Author: cmb69

NEWS

@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   . Fixed bug #80901 (Info leak in ftp extension). (cmb)
   . Fixed bug #79100 (Wrong FTP error messages). (cmb)
 
+- MBString:
+  . Fixed bug #81011 (mb_convert_encoding removes references from arrays). (cmb)
+
 - ODBC:
   . Fixed bug #80460 (ODBC doesn't account for SQL_NO_TOTAL indicator). (cmb)
 

ext/mbstring/mbstring.c

@@ -2451,6 +2451,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons
 		}
 		/* convert value */
 		ZEND_ASSERT(entry);
+try_again:
 		switch(Z_TYPE_P(entry)) {
 			case IS_STRING:
 				cval = php_mb_convert_encoding(
@@ -2475,6 +2476,9 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons
 					ZVAL_EMPTY_ARRAY(&entry_tmp);
 				}
 				break;
+			case IS_REFERENCE:
+				entry = Z_REFVAL_P(entry);
+				goto try_again;
 			case IS_OBJECT:
 			default:
 				if (key) {

ext/mbstring/tests/bug81011.phpt

@@ -0,0 +1,85 @@
+--TEST--
+Bug #81011 (mb_convert_encoding removes references from arrays)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die("skip mbstring extension not available");
+?>
+--FILE--
+<?php
+$array = [
+    'ads' => [
+        123 => ['name' => 'this', 'id' => 444],
+        234 => ['name' => 'that', 'id' => 555],
+    ],
+    'other' => ['one', 'two']
+    ];
+         
+// we modify array elements using reference     
+foreach( $array['ads'] as &$ad ){
+    $ad['premium'] = (int)($ad['id'] == 555);
+}
+
+var_dump($array);
+var_dump(mb_convert_encoding($array, 'UTF-8', 'UTF-8'));
+?>
+--EXPECT--
+array(2) {
+  ["ads"]=>
+  array(2) {
+    [123]=>
+    array(3) {
+      ["name"]=>
+      string(4) "this"
+      ["id"]=>
+      int(444)
+      ["premium"]=>
+      int(0)
+    }
+    [234]=>
+    &array(3) {
+      ["name"]=>
+      string(4) "that"
+      ["id"]=>
+      int(555)
+      ["premium"]=>
+      int(1)
+    }
+  }
+  ["other"]=>
+  array(2) {
+    [0]=>
+    string(3) "one"
+    [1]=>
+    string(3) "two"
+  }
+}
+array(2) {
+  ["ads"]=>
+  array(2) {
+    [123]=>
+    array(3) {
+      ["name"]=>
+      string(4) "this"
+      ["id"]=>
+      int(444)
+      ["premium"]=>
+      int(0)
+    }
+    [234]=>
+    array(3) {
+      ["name"]=>
+      string(4) "that"
+      ["id"]=>
+      int(555)
+      ["premium"]=>
+      int(1)
+    }
+  }
+  ["other"]=>
+  array(2) {
+    [0]=>
+    string(3) "one"
+    [1]=>
+    string(3) "two"
+  }
+}