Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix #76167: mbstring may use pointer from some previous request

Author: cmb69

NEWS

@@ -14,6 +14,10 @@ PHP                                                                        NEWS
   . Fixed bug #81532 (Change of $depth behaviour in json_encode() on PHP 8.1).
     (Nikita)
 
+- MBString:
+  . Fixed bug #76167 (mbstring may use pointer from some previous request).
+    (cmb, cataphract)
+
 14 Oct 2021, PHP 8.1.0RC4
 
 - CLI:

ext/mbstring/mbstring.c

@@ -4202,10 +4202,6 @@ static void php_mb_populate_current_detect_order_list(void)
 	const mbfl_encoding **entry = 0;
 	size_t nentries;
 
-	if (MBSTRG(current_detect_order_list)) {
-		return;
-	}
-
 	if (MBSTRG(detect_order_list) && MBSTRG(detect_order_list_size)) {
 		nentries = MBSTRG(detect_order_list_size);
 		entry = (const mbfl_encoding **)safe_emalloc(nentries, sizeof(mbfl_encoding*), 0);