bug #39738 [VarDumper] fix mutating $GLOBALS while cloning it (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d223a5ed40b2 · 2021-01-07T14:07:47.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [VarDumper] fix mutating $GLOBALS while cloning it | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39679 | License | MIT | Doc PR | - Also preparing for https://wiki.php.net/rfc/restrict_globals_usage Commits ------- 384b0ad [VarDumper] fix mutating $GLOBALS while cloning it
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -335,7 +335,7 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,
                 }
                 $cursor->hardRefTo = $refs[$r];
                 $cursor->hardRefHandle = $this->useRefHandles & $item->handle;
-                $cursor->hardRefCount = $item->refCount;
+                $cursor->hardRefCount = 0 < $item->handle ? $item->refCount : 0;
             }
             $cursor->attr = $item->attr;
             $type = $item->class ?: \gettype($item->value);
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -159,13 +159,19 @@ protected function doClone($var)
                         if (Stub::ARRAY_ASSOC === $stub->class) {
                             // Copies of $GLOBALS have very strange behavior,
                             // let's detect them with some black magic
-                            $a[$gid] = true;
-
-                            // Happens with copies of $GLOBALS
-                            if (isset($v[$gid])) {
+                            if (\PHP_VERSION_ID < 80100 && ($a[$gid] = true) && isset($v[$gid])) {
                                 unset($v[$gid]);
                                 $a = [];
                                 foreach ($v as $gk => &$gv) {
+                                    if ($v === $gv) {
+                                        unset($v);
+                                        $v = new Stub();
+                                        $v->value = [$v->cut = \count($gv), Stub::TYPE_ARRAY => 0];
+                                        $v->handle = -1;
+                                        $gv = &$hardRefs[spl_object_id($v)];
+                                        $gv = $v;
+                                    }
+
                                     $a[$gk] = &$gv;
                                 }
                                 unset($gv);
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -439,6 +439,7 @@ public function testRefsInProperties()
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled
+     * @requires PHP < 8.1
      */
     public function testSpecialVars56()
     {
@@ -453,11 +454,11 @@ public function testSpecialVars56()
     ]
   ]
   1 => array:1 [
-    "GLOBALS" => &2 array:1 [
-      "GLOBALS" => &2 array:1 [&2]
-    ]
+    "GLOBALS" => & array:1 [ …1]
+  ]
+  2 => &3 array:1 [
+    "GLOBALS" => &3 array:1 [&3]
   ]
-  2 => &2 array:1 [&2]
 ]
 EOTXT
             ,
@@ -468,6 +469,7 @@ public function testSpecialVars56()
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled
+     * @requires PHP < 8.1
      */
     public function testGlobals()
     {
@@ -490,11 +492,11 @@ public function testGlobals()
             <<<'EOTXT'
 array:2 [
   1 => array:1 [
-    "GLOBALS" => &1 array:1 [
-      "GLOBALS" => &1 array:1 [&1]
-    ]
+    "GLOBALS" => & array:1 [ …1]
+  ]
+  2 => &2 array:1 [
+    "GLOBALS" => &2 array:1 [&2]
   ]
-  2 => &1 array:1 [&1]
 ]
 
 EOTXT
@@ -584,6 +586,6 @@ private function getSpecialVars()
             return $var;
         };
 
-        return [$var(), $GLOBALS, &$GLOBALS];
+        return eval('return [$var(), $GLOBALS, &$GLOBALS];');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,`
`335`	`335`	`}`
`336`	`336`	`$cursor->hardRefTo = $refs[$r];`
`337`	`337`	`$cursor->hardRefHandle = $this->useRefHandles & $item->handle;`
`338`		`- $cursor->hardRefCount = $item->refCount;`
	`338`	`+ $cursor->hardRefCount = 0 < $item->handle ? $item->refCount : 0;`
`339`	`339`	`}`
`340`	`340`	`$cursor->attr = $item->attr;`
`341`	`341`	`$type = $item->class ?: \gettype($item->value);`
Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,7 @@ public function testRefsInProperties()`
`439`	`439`	`/**`
`440`	`440`	`* @runInSeparateProcess`
`441`	`441`	`* @preserveGlobalState disabled`
	`442`	`+ * @requires PHP < 8.1`
`442`	`443`	`*/`
`443`	`444`	`public function testSpecialVars56()`
`444`	`445`	`{`
`@@ -453,11 +454,11 @@ public function testSpecialVars56()`
`453`	`454`	`]`
`454`	`455`	`]`
`455`	`456`	`1 => array:1 [`
`456`		`- "GLOBALS" => &2 array:1 [`
`457`		`- "GLOBALS" => &2 array:1 [&2]`
`458`		`- ]`
	`457`	`+ "GLOBALS" => & array:1 [ …1]`
	`458`	`+ ]`
	`459`	`+ 2 => &3 array:1 [`
	`460`	`+ "GLOBALS" => &3 array:1 [&3]`
`459`	`461`	`]`
`460`		`- 2 => &2 array:1 [&2]`
`461`	`462`	`]`
`462`	`463`	`EOTXT`
`463`	`464`	`,`
`@@ -468,6 +469,7 @@ public function testSpecialVars56()`
`468`	`469`	`/**`
`469`	`470`	`* @runInSeparateProcess`
`470`	`471`	`* @preserveGlobalState disabled`
	`472`	`+ * @requires PHP < 8.1`
`471`	`473`	`*/`
`472`	`474`	`public function testGlobals()`
`473`	`475`	`{`
`@@ -490,11 +492,11 @@ public function testGlobals()`
`490`	`492`	`<<<'EOTXT'`
`491`	`493`	`array:2 [`
`492`	`494`	`1 => array:1 [`
`493`		`- "GLOBALS" => &1 array:1 [`
`494`		`- "GLOBALS" => &1 array:1 [&1]`
`495`		`- ]`
	`495`	`+ "GLOBALS" => & array:1 [ …1]`
	`496`	`+ ]`
	`497`	`+ 2 => &2 array:1 [`
	`498`	`+ "GLOBALS" => &2 array:1 [&2]`
`496`	`499`	`]`
`497`		`- 2 => &1 array:1 [&1]`
`498`	`500`	`]`
`499`	`501`
`500`	`502`	`EOTXT`
`@@ -584,6 +586,6 @@ private function getSpecialVars()`
`584`	`586`	`return $var;`
`585`	`587`	`};`
`586`	`588`
`587`		`- return [$var(), $GLOBALS, &$GLOBALS];`
	`589`	`+ return eval('return [$var(), $GLOBALS, &$GLOBALS];');`
`588`	`590`	`}`
`589`	`591`	`}`