out_s3: fix NULL dereference when upload_id is unset #3841
Merged
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
atheriel
force-pushed
the
fix-segfault-with-unset-upload-id
branch
from
2103743
to
4af07e4
Compare
When upload_id is not set in create_multipart_upload() (which can occur in some failure modes), subsequent retries will segfault when checking this ID in complete_multipart_upload(). This commit simply checks that the upload ID has been set and returns the usual error code instead of crashing if not. It also logs an error message for the user. Discussed in fluent#3838. Signed-off-by: Aaron Jacobs <aaron.jacobs@crescendotechnology.com>
atheriel
force-pushed
the
fix-segfault-with-unset-upload-id
branch
from
4af07e4
to
398cd06
Compare
PettitWesley
approved these changes
Aug 2, 2021
|
@atheriel this looks good. Please:
|
|
@PettitWesley FYI.
The configuration was changed. We can merge PR without it. |
|
@atheriel please also still submit the same commit against 1.8 |
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.
When upload_id is not set in
create_multipart_upload()(which can occur in some failure modes seen in #3838), subsequent retries will segfault when checking this ID incomplete_multipart_upload().This PR simply checks that the upload ID has been set and returns the usual error code instead of crashing if not. I don't have a way to reproduce the errors that could lead to this state, unfortunately.
Discussed in #3838.
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
Documentation
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.