Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix memory leak in array unpack with refcounted numeric string key

Author: nikic

Zend/tests/array_unpack/string_keys.phpt

@@ -22,6 +22,13 @@ function gen() {
 }
 var_dump([...gen()]);
 
+// Same as previous, but with refcounted string.
+function gen2() {
+    $foo = "2";
+    yield "4" . $foo => 42;
+}
+var_dump([...gen2()]);
+
 ?>
 --EXPECT--
 array(4) {
@@ -56,3 +63,7 @@ array(1) {
   [0]=>
   int(42)
 }
+array(1) {
+  [0]=>
+  int(42)
+}

Zend/zend_vm_def.h

@@ -6069,6 +6069,7 @@ ZEND_VM_C_LABEL(add_unpack_again):
 					zend_hash_update(result_ht, Z_STR(key), val);
 					zval_ptr_dtor_str(&key);
 				} else {
+					zval_ptr_dtor(&key);
 					if (!zend_hash_next_index_insert(result_ht, val)) {
 						zend_cannot_add_element();
 						zval_ptr_dtor_nogc(val);

Zend/zend_vm_execute.h

@@ -2609,6 +2609,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_UNPACK_SPEC_HANDLER(
 					zend_hash_update(result_ht, Z_STR(key), val);
 					zval_ptr_dtor_str(&key);
 				} else {
+					zval_ptr_dtor(&key);
 					if (!zend_hash_next_index_insert(result_ht, val)) {
 						zend_cannot_add_element();
 						zval_ptr_dtor_nogc(val);