Prevent endless recursion in error handler. Fixes #206

rosell-dk · Aug 2, 2019 · 37e0094 · 37e0094
1 parent 4ea37ba
commit 37e0094
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Convert/Converters/BaseTraits/WarningLoggerTrait.php b/src/Convert/Converters/BaseTraits/WarningLoggerTrait.php
@@ -79,10 +79,18 @@ public function warningHandler($errno, $errstr, $errfile, $errline)
         $this->logLn($msg, 'italic');
         $this->logLn('');
 
-        //echo 'previously defined handler:' . print_r($this->previousErrorHandler, true);
-
         if (!is_null($this->previousErrorHandler)) {
-            return call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline);
+            // If previousErrorHandler is this very error handler, exit to avoid recursion
+            // (this could happen if ::activateWarningLogger() were called twice)
+            if (
+                is_array($this->previousErrorHandler) &&
+                isset($this->previousErrorHandler[0]) &&
+                ($this->previousErrorHandler[0] == $this)
+            ) {
+                return false;
+            } else {
+                return call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline);
+            }
         } else {
             return false;
         }