maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix runtime panic in BackendDisks.Merge() (#8524)

Browse source
This commit is contained in:
Praveen raj Mani 2019-11-14 23:47:41 +05:30 committed by Harshavardhana
parent 26a866a202
commit e3273bc5bf
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/madmin/info-commands.go
View file

@ -98,6 +98,9 @@ func (d1 BackendDisks) Sum() (sum int) {
// Merge - Reduces two endpoint-disk maps.
func (d1 BackendDisks) Merge(d2 BackendDisks) BackendDisks {
if len(d2) == 0 {
d2 = make(BackendDisks)
}
for i1, v1 := range d1 {
if v2, ok := d2[i1]; ok {
d2[i1] = v2 + v1