From 839a758a36d285c96c6c83371e7b24e12ed02a10 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 1 Oct 2018 09:50:09 -0700 Subject: [PATCH] Fix a crash due to race between Abort/CompleteMultipart (#6544) Fixes #6429 --- cmd/fs-v1-multipart.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/fs-v1-multipart.go b/cmd/fs-v1-multipart.go index 8cfa4f84d..65fb6c79e 100644 --- a/cmd/fs-v1-multipart.go +++ b/cmd/fs-v1-multipart.go @@ -621,12 +621,12 @@ func (fs *FSObjects) CompleteMultipartUpload(ctx context.Context, bucket string, } if appendFallback { - fsRemoveFile(ctx, file.filePath) + if file != nil { + fsRemoveFile(ctx, file.filePath) + } for _, part := range parts { partPath := getPartFile(entries, part.PartNumber, part.ETag) - partPath = pathJoin(uploadIDDir, partPath) - err = mioutil.AppendFile(appendFilePath, partPath) - if err != nil { + if err = mioutil.AppendFile(appendFilePath, pathJoin(uploadIDDir, partPath)); err != nil { logger.LogIf(ctx, err) return oi, toObjectErr(err) }