[VarExporter] Fix handling mangled property names returned by __sleep()

symfony · Nov 16, 2023 · fdb022f · fdb022f
1 parent 11401fe
commit fdb022f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/Internal/Exporter.php b/Internal/Exporter.php
@@ -157,21 +157,19 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $n = substr($n, 1 + $i);
                 }
                 if (null !== $sleep) {
-                    if (!isset($sleep[$n]) || ($i && $c !== $class)) {
+                    if (!isset($sleep[$name]) && (!isset($sleep[$n]) || ($i && $c !== $class))) {
                         unset($arrayValue[$name]);
                         continue;
                     }
-                    $sleep[$n] = false;
+                    unset($sleep[$name], $sleep[$n]);
                 }
                 if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
                     $properties[$c][$n] = $v;
                 }
             }
             if ($sleep) {
                 foreach ($sleep as $n => $v) {
-                    if (false !== $v) {
-                        trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
-                    }
+                    trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
                 }
             }
             if (method_exists($class, '__unserialize')) {

diff --git a/Tests/Fixtures/var-on-sleep.php b/Tests/Fixtures/var-on-sleep.php
@@ -11,6 +11,14 @@
                 'night',
             ],
         ],
+        'Symfony\\Component\\VarExporter\\Tests\\GoodNight' => [
+            'foo' => [
+                'afternoon',
+            ],
+            'bar' => [
+                'morning',
+            ],
+        ],
     ],
     $o[0],
     []

diff --git a/Tests/VarExporterTest.php b/Tests/VarExporterTest.php
@@ -349,17 +349,21 @@ public function setFlags($flags): void
 class GoodNight
 {
     public $good;
+    protected $foo;
+    private $bar;
 
     public function __construct()
     {
         unset($this->good);
+        $this->foo = 'afternoon';
+        $this->bar = 'morning';
     }
 
     public function __sleep(): array
     {
         $this->good = 'night';
 
-        return ['good'];
+        return ['good', 'foo', "\0*\0foo", "\0".__CLASS__."\0bar"];
     }
 }
 

diff --git a/VarExporter.php b/VarExporter.php
@@ -83,7 +83,7 @@ public static function export($value, bool &$isStaticValue = null, array &$found
         ksort($states);
 
         $wakeups = [null];
-        foreach ($states as $k => $v) {
+        foreach ($states as $v) {
             if (\is_array($v)) {
                 $wakeups[-$v[0]] = $v[1];
             } else {