Merge pull request #27669 from nextcloud/backport/27663/stable22

[stable22] Unshift crash reports when they are loaded, to break the recusion
This commit is contained in:
Christoph Wurst 2021-06-25 13:57:48 +02:00 committed by GitHub
commit 57a4ef9da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -35,6 +35,7 @@ use OCP\Support\CrashReport\IMessageReporter;
use OCP\Support\CrashReport\IRegistry;
use OCP\Support\CrashReport\IReporter;
use Throwable;
use function array_shift;
class Registry implements IRegistry {
@ -119,8 +120,7 @@ class Registry implements IRegistry {
}
private function loadLazyProviders(): void {
$classes = $this->lazyReporters;
foreach ($classes as $class) {
while (($class = array_shift($this->lazyReporters)) !== null) {
try {
/** @var IReporter $reporter */
$reporter = $this->serverContainer->query($class);
@ -151,6 +151,5 @@ class Registry implements IRegistry {
]);
}
}
$this->lazyReporters = [];
}
}