From 651487507a44fbb36c5902a247c907280c54ec63 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 5 Mar 2021 09:42:46 -0800 Subject: [PATCH] fix: Merge() should merge and return a copy (#11714) fixes #11713 --- pkg/madmin/info-commands.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/madmin/info-commands.go b/pkg/madmin/info-commands.go index dfa65cebe..8aa835dab 100644 --- a/pkg/madmin/info-commands.go +++ b/pkg/madmin/info-commands.go @@ -97,14 +97,15 @@ func (d1 BackendDisks) Merge(d2 BackendDisks) BackendDisks { if len(d2) == 0 { d2 = make(BackendDisks) } + var merged = make(BackendDisks) for i1, v1 := range d1 { if v2, ok := d2[i1]; ok { - d2[i1] = v2 + v1 + merged[i1] = v2 + v1 continue } - d2[i1] = v1 + merged[i1] = v1 } - return d2 + return merged } // StorageInfo - Connect to a minio server and call Storage Info Management API