web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Use correct minio error (#26634)

Browse source 
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.
This commit is contained in:
delvh 2023-08-21 18:20:11 +02:00 • committed by GitHub
parent 0731abc444
commit 3d80308b36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 // Check to see if we already own this bucket
exists, errBucketExists := minioClient.BucketExists(ctx, config.Bucket) exists, err := minioClient.BucketExists(ctx, config.Bucket)
if errBucketExists != nil { if err != nil {
return nil, convertMinioErr(err) return nil, convertMinioErr(err)
} }