[VarExporter] Guard against unset keys in Registry::$states

nicolas-grekas · nicolas-grekas · commit 4f20ec692080 · 2022-09-19T08:08:20.000+02:00
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -324,7 +324,7 @@ public function __serialize(): array
 
     public function __destruct()
     {
-        $state = Registry::$states[$this->lazyObjectId ?? null] ?? null;
+        $state = Registry::$states[$this->lazyObjectId ?? ''] ?? null;
 
         try {
             if ($state && !\in_array($state->status, [LazyObjectState::STATUS_INITIALIZED_FULL, LazyObjectState::STATUS_INITIALIZED_PARTIAL], true)) {
diff --git a/src/Symfony/Component/VarExporter/LazyProxyTrait.php b/src/Symfony/Component/VarExporter/LazyProxyTrait.php
@@ -96,7 +96,8 @@ public function &__get($name): mixed
             if (null === $scope || isset($propertyScopes["\0$scope\0$name"])) {
                 if (isset($this->lazyObjectId)) {
                     if ('lazyObjectReal' === $name && self::class === $scope) {
-                        $this->lazyObjectReal = (Registry::$states[$this->lazyObjectId]->initializer)();
+                        $state = Registry::$states[$this->lazyObjectId] ?? null;
+                        $this->lazyObjectReal = $state ? ($state->initializer)() : null;
 
                         return $this->lazyObjectReal;
                     }
@@ -196,7 +197,9 @@ public function __isset($name): bool
             if (null === $scope || isset($propertyScopes["\0$scope\0$name"])) {
                 if (isset($this->lazyObjectId)) {
                     if ('lazyObjectReal' === $name && self::class === $scope) {
-                        return null !== $this->lazyObjectReal = (Registry::$states[$this->lazyObjectId]->initializer)();
+                        $state = Registry::$states[$this->lazyObjectId] ?? null;
+
+                        return null !== $this->lazyObjectReal = $state ? ($state->initializer)() : null;
                     }
                     if (isset($this->lazyObjectReal)) {
                         $instance = $this->lazyObjectReal;

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public function __serialize(): array`
`324`	`324`
`325`	`325`	`public function __destruct()`
`326`	`326`	`{`
`327`		`- $state = Registry::$states[$this->lazyObjectId ?? null] ?? null;`
	`327`	`+ $state = Registry::$states[$this->lazyObjectId ?? ''] ?? null;`
`328`	`328`
`329`	`329`	`try {`
`330`	`330`	`if ($state && !\in_array($state->status, [LazyObjectState::STATUS_INITIALIZED_FULL, LazyObjectState::STATUS_INITIALIZED_PARTIAL], true)) {`