From bfaca7fc78680f8efa4405d497a13a32e760b7ba Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 21 Nov 2019 22:25:08 +0100
Subject: [PATCH] Sensitive values handling

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/Log/ExceptionSerializer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php
index 8cfdb57b22..fe28120b39 100644
--- a/lib/private/Log/ExceptionSerializer.php
+++ b/lib/private/Log/ExceptionSerializer.php
@@ -92,8 +92,10 @@ class ExceptionSerializer {
 	];
 
 	private function editTrace(array &$sensitiveValues, array $traceLine): array {
-		$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
-		$traceLine['args'] = ['*** sensitive parameters replaced ***'];
+		if (isset($traceLine['args'])) {
+			$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+			$traceLine['args'] = ['*** sensitive parameters replaced ***'];
+		}
 		return $traceLine;
 	}