fixing SIGSEGV when running containers#303
Merged
aaronlehmann merged 1 commit intodocker:masterfrom Jul 6, 2017
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #303 +/- ##
=======================================
Coverage 48.68% 48.68%
=======================================
Files 185 185
Lines 12168 12168
=======================================
Hits 5924 5924
Misses 5877 5877
Partials 367 367 |
dnephin
reviewed
Jul 6, 2017
cli/command/container/run.go
Outdated
|
|
||
| if close != nil { | ||
| defer close() | ||
| } |
Contributor
There was a problem hiding this comment.
I think the more common way of doing this is to just move the defer close() after the if err != nil. This is only nil if there is an error, so handling the error first will fix the problem.
Contributor
Author
There was a problem hiding this comment.
@dnephin - indeed you are right. i thought that we might have no error and still have nil close.
Thanks for the hint.
Contributor
Author
|
@dnephin - LGTY ? |
dnephin
reviewed
Jul 6, 2017
Contributor
dnephin
left a comment
dnephin
left a comment
There was a problem hiding this comment.
LGTM, thanks!
Please also squash to a single git commit.
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com> moving the deffering of the close after the error checking Signed-off-by: Yassine TIJANI <yasstij11@gmail.com> fixing SIGSEGV when running containers Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
yastij
force-pushed
the
fix-SIGSEGV-runContainer
branch
from
384fa20 to
45b0e7c
Compare
Contributor
Author
|
@dnephin - Done. |
dnephin
approved these changes
Jul 6, 2017
|
LGTM |
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.
Signed-off-by: Yassine TIJANI yasstij11@gmail.com
- How I did it checking that close is not before deferring it.
fixes moby/moby#33975