Release the initializer before deleting the info in markLazyObjectAsInitialized() too

Author: lazerg

Zend/tests/lazy_objects/gh24715.phpt Zend/tests/lazy_objects/gh24715-001.phptZend/tests/lazy_objects/gh24715.phpt renamed to Zend/tests/lazy_objects/gh24715-001.phpt

@@ -0,0 +1,33 @@
+--TEST--
+GH-24715 002: Object reset as lazy by a destructor triggered when releasing the initializer in markLazyObjectAsInitialized()
+--FILE--
+<?php
+
+class C {
+    public $a;
+}
+
+class D {
+    public function __destruct() {
+        global $obj, $reflector;
+        try {
+            $reflector->resetAsLazyGhost($obj, function () {});
+        } catch (Error $e) {
+            printf("%s: %s\n", $e::class, $e->getMessage());
+        }
+    }
+}
+
+$reflector = new ReflectionClass(C::class);
+$d = new D();
+$obj = $reflector->newLazyGhost(function ($obj) use ($d) {});
+unset($d);
+
+var_dump($reflector->markLazyObjectAsInitialized($obj) === $obj);
+var_dump($reflector->isUninitializedLazyObject($obj));
+
+?>
+--EXPECT--
+Error: Can not reset an object while it is being initialized
+bool(true)
+bool(false)

Zend/tests/lazy_objects/gh24715-002.phpt

@@ -161,6 +161,20 @@ zend_lazy_object_flags_t zend_lazy_object_get_flags(zend_object *obj)
 	return zend_lazy_object_get_info(obj)->flags;
 }
 
+/* Release the initializer while the info is still registered, so that
+ * destructors triggered by this can not reset the object */
+static void zend_lazy_object_release_initializer(zend_object *obj)
+{
+	zend_lazy_object_info *info = zend_hash_index_find_ptr(&EG(lazy_objects_store).infos, obj->handle);
+	ZEND_ASSERT(info && !(info->flags & ZEND_LAZY_OBJECT_INITIALIZED));
+
+	zval initializer_zv;
+	ZVAL_COPY_VALUE(&initializer_zv, &info->u.initializer.zv);
+	ZVAL_UNDEF(&info->u.initializer.zv);
+	zend_fcc_dtor(&info->u.initializer.fcc);
+	zval_ptr_dtor(&initializer_zv);
+}
+
 void zend_lazy_object_del_info(zend_object *obj)
 {
 	zend_result res = zend_hash_index_del(&EG(lazy_objects_store).infos, obj->handle);
@@ -412,6 +426,7 @@ ZEND_API zend_object *zend_lazy_object_mark_as_initialized(zend_object *obj)
 		}
 	}
 
+	zend_lazy_object_release_initializer(obj);
 	zend_lazy_object_del_info(obj);
 
 	return obj;
@@ -672,14 +687,7 @@ ZEND_API zend_object *zend_lazy_object_init(zend_object *obj)
 		zend_release_properties(properties_snapshot);
 	}
 
-	/* Release the initializer while the info is still registered, so that
-	 * destructors triggered by this can not reset the object */
-	zend_lazy_object_info *info = zend_hash_index_find_ptr(&EG(lazy_objects_store).infos, obj->handle);
-	zval initializer_zv;
-	ZVAL_COPY_VALUE(&initializer_zv, &info->u.initializer.zv);
-	ZVAL_UNDEF(&info->u.initializer.zv);
-	zend_fcc_dtor(&info->u.initializer.fcc);
-	zval_ptr_dtor(&initializer_zv);
+	zend_lazy_object_release_initializer(obj);
 
 	/* Must be very last in this function, for the
 	 * zend_lazy_object_has_stale_info() check */