[DI] Fix infinite loop when analyzing references

nicolas-grekas · nicolas-grekas · commit f772d2fc7c63 · 2017-11-22T16:44:01.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -356,6 +356,7 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre
             if (isset($checkedNodes[$id])) {
                 continue;
             }
+            $checkedNodes[$id] = true;
 
             if ($node->getValue() && ($edge->isLazy() || $edge->isWeak())) {
                 // no-op
@@ -367,10 +368,8 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre
             } else {
                 $currentPath[$id] = $id;
                 $this->analyzeCircularReferences($node->getOutEdges(), $checkedNodes, $currentPath);
+                array_pop($currentPath);
             }
-
-            $checkedNodes[$id] = true;
-            array_pop($currentPath);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre`
`356`	`356`	`if (isset($checkedNodes[$id])) {`
`357`	`357`	`continue;`
`358`	`358`	`}`
	`359`	`+ $checkedNodes[$id] = true;`
`359`	`360`
`360`	`361`	`if ($node->getValue() && ($edge->isLazy() \|\| $edge->isWeak())) {`
`361`	`362`	`// no-op`
`@@ -367,10 +368,8 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre`
`367`	`368`	`} else {`
`368`	`369`	`$currentPath[$id] = $id;`
`369`	`370`	`$this->analyzeCircularReferences($node->getOutEdges(), $checkedNodes, $currentPath);`
	`371`	`+ array_pop($currentPath);`
`370`	`372`	`}`
`371`		`-`
`372`		`- $checkedNodes[$id] = true;`
`373`		`- array_pop($currentPath);`
`374`	`373`	`}`
`375`	`374`	`}`
`376`	`375`