fix overwriting original vars when logging

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/lib/private/Log/ExceptionSerializer.php b/lib/private/Log/ExceptionSerializer.php
index dab134b26a4d315c3d7b35076c4ad408b4eff80f..a792f966edaf32eafc5c1dd501375809a92b626d 100644 (file)
--- a/lib/private/Log/ExceptionSerializer.php
+++ b/lib/private/Log/ExceptionSerializer.php
@@ -208,14 +208,16 @@ class ExceptionSerializer {
        }
 
        private function removeValuesFromArgs($args, $values) {
-               foreach ($args as &$arg) {
+               $workArgs = [];
+               foreach ($args as $arg) {
                        if (in_array($arg, $values, true)) {
                                $arg = '*** sensitive parameter replaced ***';
                        } elseif (is_array($arg)) {
                                $arg = $this->removeValuesFromArgs($arg, $values);
                        }
+                       $workArgs[] = $arg;
                }
-               return $args;
+               return $workArgs;
        }
 
        private function encodeTrace($trace) {

diff --git a/tests/lib/Log/ExceptionSerializerTest.php b/tests/lib/Log/ExceptionSerializerTest.php
index 1b7bfee2c87e55bdd668e1e2ea7c875e7065adfd..f8cc6b77ee6c88e54d563787e87cc3935ba0f31f 100644 (file)
--- a/tests/lib/Log/ExceptionSerializerTest.php
+++ b/tests/lib/Log/ExceptionSerializerTest.php
@@ -60,8 +60,9 @@ class ExceptionSerializerTest extends TestCase {
                        $secret = ['Secret'];
                        $this->emit([&$secret]);
                } catch (\Exception $e) {
-                       $this->serializer->serializeException($e);
+                       $serializedData = $this->serializer->serializeException($e);
                        $this->assertSame(['Secret'], $secret);
+                       $this->assertSame('*** sensitive parameters replaced ***', $serializedData['Trace'][0]['args'][0]);
                }
        }
 }