domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Use correct minio error (#26634) (#26639)

Browse source 
Backport #26634 by @delvh

Previously, `err` was defined above, checked for `err == nil` and used
nowhere else.
Hence, the result of `convertMinioErr` would always be `nil`.
This leads to a NPE further down the line.
That is not intentional, it should convert the error of the most recent
operation, not one of its predecessors.

Found through
1143185780.

Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit a4b14638b5)
This commit is contained in:
Giteabot 2023-08-22 00:51:30 +08:00 • committed by Earl Warren
parent 5abca17b64
commit 06c45d3b6e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/storage/minio.go
View file

@ -91,8 +91,8 @@ func NewMinioStorage(ctx context.Context, cfg *setting.Storage) (ObjectStorage,
}
// Check to see if we already own this bucket
exists, errBucketExists := minioClient.BucketExists(ctx, config.Bucket)
if errBucketExists != nil {
exists, err := minioClient.BucketExists(ctx, config.Bucket)
if err != nil {
return nil, convertMinioErr(err)
}