MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 15:33:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle indexes correctly in DeleteMultipleObjectsHandler (#8544)

Browse Source 
Regression from #8509 which changes objectsToDelete entry
from a list to map. This will cause index out of range
panic if object is not selected for delete.
This commit is contained in:
poornas 2019-11-20 17:51:10 -08:00 committed by Harshavardhana
parent a9b87c0a16
commit 4da68cfcfc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/bucket-handlers.go
View File

@ -404,20 +404,24 @@ func (api objectAPIHandlers) DeleteMultipleObjectsHandler(w http.ResponseWriter,
toNames := func(input map[string]int) (output []string) { toNames := func(input map[string]int) (output []string) {
output = make([]string, len(input)) output = make([]string, len(input))
for name, index := range input { idx := 0
output[index] = name for name := range input {
output[idx] = name
idx++
} }
return return
} }
errs, err := deleteObjectsFn(ctx, bucket, toNames(objectsToDelete)) deleteList := toNames(objectsToDelete)
errs, err := deleteObjectsFn(ctx, bucket, deleteList)
if err != nil { if err != nil {
writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r)) writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL, guessIsBrowserReq(r))
return return
} }
for _, index := range objectsToDelete { for i, objName := range deleteList {
dErrs[index] = toAPIErrorCode(ctx, errs[index]) dIdx := objectsToDelete[objName]
dErrs[dIdx] = toAPIErrorCode(ctx, errs[i])
} }
// Collect deleted objects and errors if any. // Collect deleted objects and errors if any.