[release/1.5] Fix panic in metadata content writer on copy error#6045
Merged
estesp merged 1 commit intocontainerd:release/1.5from Sep 24, 2021
Merged
Conversation
The `createAndCopy` function is only called when `nw.w` is nil in order to create a new writer and prepare it. The current code is attempting to close `nw.w` when there is a copy error. The correct behavior would be to close the new writer and not touch `nw.w`. Signed-off-by: Derek McGowan <[email protected]> (cherry picked from commit b9cf0d7) Signed-off-by: Derek McGowan <[email protected]>
|
Build succeeded.
|
AkihiroSuda
approved these changes
Sep 24, 2021
Member
|
backport of #6043 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The
createAndCopyfunction is only called whennw.wis nilin order to create a new writer and prepare it. The current code
is attempting to close
nw.wwhen there is a copy error. Thecorrect behavior would be to close the new writer and not touch
nw.w.Signed-off-by: Derek McGowan [email protected]
(cherry picked from commit b9cf0d7)
Signed-off-by: Derek McGowan [email protected]