Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  ext/standard: Don't share the unserialize() context with enum autoloaders

Author: ndossche

NEWS

@@ -102,6 +102,8 @@ PHP                                                                        NEWS
     bcrypt costs. (Ilia Alshanetsky)
   . Fixed proc_open() null descriptor not being inheritable on Windows.
     (Jorg Sowa)
+  . Don't share the unserialize() context with enum autoloaders.
+    (Nicolas Grekas)
 
 - Tidy:
   . Fixed tidy_repair_string(), tidy_repair_file(), tidy::repairString() and

Zend/tests/enum/unserialize-autoload-nested.phpt

@@ -0,0 +1,36 @@
+--TEST--
+Enum unserialize runs the autoloader outside of the current unserialize() context
+--FILE--
+<?php
+
+class Init {
+    public bool $ready = false;
+
+    public function __unserialize(array $data): void {
+        $this->ready = true;
+    }
+}
+
+enum Backed: string {
+    case Foo = Value::FOO;
+}
+
+spl_autoload_register(function ($class) {
+    var_dump(unserialize('O:4:"Init":0:{}')->ready);
+    eval(match ($class) {
+        'Pure' => 'enum Pure { case Foo; }',
+        'Value' => 'class Value { const FOO = "foo"; }',
+    });
+});
+
+foreach (['E:8:"Pure:Foo";', 'E:10:"Backed:Foo";'] as $enum) {
+    $data = unserialize('a:3:{i:0;' . $enum . 'i:1;O:8:"stdClass":0:{}i:2;r:3;}');
+    var_dump($data[1] === $data[2]);
+}
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)

ext/standard/var_unserializer.re

@@ -1385,7 +1385,9 @@ object ":" uiv ":" ["]	{
 		goto fail;
 	}
 
+	BG(serialize_lock)++;
 	zend_class_entry *ce = zend_lookup_class(enum_name);
+	BG(serialize_lock)--;
 	if (!ce) {
 		php_error_docref(NULL, E_WARNING, "Class '%s' not found", ZSTR_VAL(enum_name));
 		goto fail;
@@ -1414,7 +1416,10 @@ object ":" uiv ":" ["]	{
 
 	zval *value = &c->value;
 	if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-		if (zval_update_constant_ex(value, c->ce) == FAILURE) {
+		BG(serialize_lock)++;
+		zend_result result = zval_update_constant_ex(value, c->ce);
+		BG(serialize_lock)--;
+		if (result == FAILURE) {
 			return 0;
 		}
 	}