From 23fc87285da9e7470d3cb1defea5cce01e39f655 Mon Sep 17 00:00:00 2001 From: Tim Swanson Date: Wed, 15 Jun 2022 17:15:00 -0400 Subject: [PATCH 1/2] Fix panic in logsink AddValues --- pkg/logger/logsink.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/logger/logsink.go b/pkg/logger/logsink.go index 0abb118..7112738 100644 --- a/pkg/logger/logsink.go +++ b/pkg/logger/logsink.go @@ -223,9 +223,7 @@ func (log *SpinnerLogSink) GetValues() []interface{} { } func (log *SpinnerLogSink) AddValues(keyAndValues []interface{}) { - for k, v := range keyAndValues { - log.values[k] = v - } + log.values = append(log.values, keyAndValues...) } func (log *SpinnerLogSink) AddName(name string) { From d3d1ee945914b875c20fd617548827fb5e857001 Mon Sep 17 00:00:00 2001 From: Tim Swanson Date: Wed, 15 Jun 2022 22:55:34 -0400 Subject: [PATCH 2/2] Fix potential array bounds issue in withValues --- pkg/logger/logger.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 79d061a..677aa1e 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -85,9 +85,8 @@ func (log *logger) WithName(name string) Logger { func (log *logger) WithValues(keysAndValues ...interface{}) Logger { sink := log.sink.copyLogger() - for k, v := range keysAndValues { - sink.values[k] = v - } + + sink.values = keysAndValues return &logger{ level: log.level,