Merge branch 'bugfix/confidential-stacktrace-errors-3318'

fixes #3318
2018-01-25 15:27:29 +01:00 · 2018-01-25 15:27:29 +01:00 · f2f9ab5bc0
parent 72ec132f25 276d4f7e67
commit f2f9ab5bc0
1 changed files with 3 additions and 1 deletions
--- a/library/Icinga/Exception/IcingaException.php
+++ b/library/Icinga/Exception/IcingaException.php
@ -74,7 +74,9 @@ class IcingaException extends Exception
        $trace = array();

        foreach ($exception->getTrace() as $index => $frame) {
-            $trace[] = "#{$index} {$frame['file']}({$frame['line']}): ";
+            $trace[] = isset($frame['file'])
+                ? "#{$index} {$frame['file']}({$frame['line']}): "
+                : "#{$index} [internal function]: ";

            if (isset($frame['class'])) {
                $trace[] = $frame['class'];