[Debug] Reset previous exception handler ealier to prevent infinite loop

nicolas-grekas · nicolas-grekas · commit f7e1bb05e24d · 2018-03-19T11:28:44.000+01:00
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -544,15 +544,16 @@ public function handleException($exception, array $error = null)
                 }
             }
         }
+        $exceptionHandler = $this->exceptionHandler;
+        $this->exceptionHandler = null;
         try {
-            if (null !== $this->exceptionHandler) {
-                return \call_user_func($this->exceptionHandler, $exception);
+            if (null !== $exceptionHandler) {
+                return \call_user_func($exceptionHandler, $exception);
             }
             $handlerException = $handlerException ?: $exception;
         } catch (\Exception $handlerException) {
         } catch (\Throwable $handlerException) {
         }
-        $this->exceptionHandler = null;
         if ($exception === $handlerException) {
             self::$reservedMemory = null; // Disable the fatal error handler
             throw $exception; // Give back $exception to the native handler
diff --git a/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -530,4 +530,17 @@ public function testLegacyInterface()
             throw $e;
         }
     }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testCustomExceptionHandler()
+    {
+        $handler = new ErrorHandler();
+        $handler->setExceptionHandler(function ($e) use ($handler) {
+            $handler->handleException($e);
+        });
+
+        $handler->handleException(new \Exception());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -544,15 +544,16 @@ public function handleException($exception, array $error = null)`
`544`	`544`	`}`
`545`	`545`	`}`
`546`	`546`	`}`
	`547`	`+ $exceptionHandler = $this->exceptionHandler;`
	`548`	`+ $this->exceptionHandler = null;`
`547`	`549`	`try {`
`548`		`- if (null !== $this->exceptionHandler) {`
`549`		`- return \call_user_func($this->exceptionHandler, $exception);`
	`550`	`+ if (null !== $exceptionHandler) {`
	`551`	`+ return \call_user_func($exceptionHandler, $exception);`
`550`	`552`	`}`
`551`	`553`	`$handlerException = $handlerException ?: $exception;`
`552`	`554`	`} catch (\Exception $handlerException) {`
`553`	`555`	`} catch (\Throwable $handlerException) {`
`554`	`556`	`}`
`555`		`- $this->exceptionHandler = null;`
`556`	`557`	`if ($exception === $handlerException) {`
`557`	`558`	`self::$reservedMemory = null; // Disable the fatal error handler`
`558`	`559`	`throw $exception; // Give back $exception to the native handler`
Original file line number	Diff line number	Diff line change
`@@ -530,4 +530,17 @@ public function testLegacyInterface()`
`530`	`530`	`throw $e;`
`531`	`531`	`}`
`532`	`532`	`}`
	`533`	`+`
	`534`	`+ /**`
	`535`	`+ * @expectedException \Exception`
	`536`	`+ */`
	`537`	`+ public function testCustomExceptionHandler()`
	`538`	`+ {`
	`539`	`+ $handler = new ErrorHandler();`
	`540`	`+ $handler->setExceptionHandler(function ($e) use ($handler) {`
	`541`	`+ $handler->handleException($e);`
	`542`	`+ });`
	`543`	`+`
	`544`	`+ $handler->handleException(new \Exception());`
	`545`	`+ }`
`533`	`546`	`}`