Fix s3 adapter access content length without nil check #5499
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nopcoder
added
bug
arielshaqed
approved these changes
Mar 15, 2023
| @@ -308,7 +308,7 @@ func (a *Adapter) Get(ctx context.Context, obj block.ObjectPointer, _ int64) (io | |||
| log.WithError(err).Errorf("failed to get S3 object bucket %s key %s", qualifiedKey.StorageNamespace, qualifiedKey.Key) | |||
| return nil, err | |||
| } | |||
| sizeBytes = *objectOutput.ContentLength | |||
| sizeBytes = aws.Int64Value(objectOutput.ContentLength) | |||
There was a problem hiding this comment.
This looks good, but TBH I don't understand what this line does: it copies the value into a variable, which it then ignores. sizeBytes is not a pointer, I don't see what effect this assignment can have.
Suggested change
| sizeBytes = aws.Int64Value(objectOutput.ContentLength) |
(I'm actually shocked that Go doesn't flag an unused variable here. It's the sort of thing gcc has been doing for ages now, at least when optimizing.)
Same applies below, too. It looks like a bad leftover.
There was a problem hiding this comment.
The variable is referenced in the defer function - so it is just for report the file size as part of the metric.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #5498