bug symfony#25971 [Debug] Fix bad registration of exception handler, leading to mem leak (nicolas-grekas)

fabpot · fabpot · commit 0924c001f988 · 2018-02-01T05:48:20.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Debug] Fix bad registration of exception handler, leading to mem leak | Q | A | ------------- | --- | Branch? | 27 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#25965 | License | MIT | Doc PR | - Commits ------- 926b1be [Debug] Fix bad registration of exception handler, leading to mem leak
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -149,9 +149,20 @@ public static function register($handler = null, $replace = true)
         }
         if (!$replace && $prev) {
             restore_error_handler();
+            $handlerIsRegistered = is_array($prev) && $handler === $prev[0];
+        } else {
+            $handlerIsRegistered = true;
         }
-        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] === $handler) {
+        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
             restore_exception_handler();
+            if (!$handlerIsRegistered) {
+                $handler = $prev[0];
+            } elseif ($handler !== $prev[0] && $replace) {
+                set_exception_handler(array($handler, 'handleException'));
+                $p = $prev[0]->setExceptionHandler(null);
+                $handler->setExceptionHandler($p);
+                $prev[0]->setExceptionHandler($p);
+            }
         } else {
             $handler->setExceptionHandler($prev);
         }
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -34,7 +34,7 @@ public function testRegister()
 
             $newHandler = new ErrorHandler();
 
-            $this->assertSame($newHandler, ErrorHandler::register($newHandler, false));
+            $this->assertSame($handler, ErrorHandler::register($newHandler, false));
             $h = set_error_handler('var_dump');
             restore_error_handler();
             $this->assertSame(array($handler, 'handleError'), $h);
