Check if stdio pipes are nil for job containers/fix windows.Close usage#1115
Merged
dcantah merged 1 commit intomicrosoft:masterfrom Aug 23, 2021
Merged
Check if stdio pipes are nil for job containers/fix windows.Close usage#1115dcantah merged 1 commit intomicrosoft:masterfrom
dcantah merged 1 commit intomicrosoft:masterfrom
Conversation
This change does two things: 1. Checks if the stdio pipes are nil before closing them via the CloseStdout, CloseStderr, CloseStdin methods. This just brings it inline with the other `cow.Process` implementations that check for nilness. 2. Fix an oversight where windows.Close was being used instead of windows.FreeLibrary after loading kernel32.dll Signed-off-by: Daniel Canter <dcanter@microsoft.com>
anmaxvl
approved these changes
Aug 21, 2021
Contributor
anmaxvl
left a comment
There was a problem hiding this comment.
LGTM. were we hitting nil deref somehow?
Contributor
Author
|
@anmaxvl Nope, but was scared of one happening somehow (and the other |
msscotb
reviewed
Aug 23, 2021
| return errors.Wrap(err, "failed to open process") | ||
| } | ||
| defer windows.Close(hProc) | ||
| defer func() { |
Contributor
There was a problem hiding this comment.
These could just be left as the original defer windows.Close(hproc) with no functionality change.
Contributor
Author
There was a problem hiding this comment.
I think our linter was whining about it as we weren't handling the error, but begs the question of how it didn't whine the first time..
Contributor
Author
There was a problem hiding this comment.
Let me look what we can get away with
Contributor
Author
There was a problem hiding this comment.
internal\jobcontainers\process.go:252:27: Error return value of windows.FreeLibrary is not checked (errcheck)
defer windows.FreeLibrary(k32)
Seems to only care about the freelibrary for some odd reason
anmaxvl
pushed a commit
to anmaxvl/hcsshim
that referenced
this pull request
Nov 17, 2021
Related work items: microsoft#930, microsoft#962, microsoft#1004, microsoft#1008, microsoft#1039, microsoft#1045, microsoft#1046, microsoft#1047, microsoft#1052, microsoft#1053, microsoft#1054, microsoft#1057, microsoft#1058, microsoft#1060, microsoft#1061, microsoft#1063, microsoft#1064, microsoft#1068, microsoft#1069, microsoft#1070, microsoft#1071, microsoft#1074, microsoft#1078, microsoft#1079, microsoft#1081, microsoft#1082, microsoft#1083, microsoft#1084, microsoft#1088, microsoft#1090, microsoft#1091, microsoft#1093, microsoft#1094, microsoft#1096, microsoft#1098, microsoft#1099, microsoft#1102, microsoft#1103, microsoft#1105, microsoft#1106, microsoft#1108, microsoft#1109, microsoft#1115, microsoft#1116, microsoft#1122, microsoft#1123, microsoft#1126
princepereira
pushed a commit
to princepereira/hcsshim
that referenced
this pull request
Aug 29, 2024
Check if stdio pipes are nil for job containers/fix windows.Close usage
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
3 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.
This change does two things:
CloseStderr, CloseStdin methods. This just brings it inline with the other
cow.Processimplementations that check for nilness.after loading kernel32.dll
Signed-off-by: Daniel Canter dcanter@microsoft.com