github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-17 07:27:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4753 from Tim-Zhang/agent-fix-stream-fd-double-close

Browse Source 
agent: Fix stream fd's double close
This commit is contained in:
Peng Tao 2022-07-27 00:54:07 +08:00 committed by GitHub
commit 27c82018d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/agent/rustjail/src/process.rs
View File

@ -28,7 +28,6 @@ macro_rules! close_process_stream {
($self: ident, $stream:ident, $stream_type: ident) => { ($self: ident, $stream:ident, $stream_type: ident) => {
if $self.$stream.is_some() { if $self.$stream.is_some() {
$self.close_stream(StreamType::$stream_type); $self.close_stream(StreamType::$stream_type);
let _ = unistd::close($self.$stream.unwrap());
$self.$stream = None; $self.$stream = None;
} }
}; };
@ -225,7 +224,7 @@ impl Process {
Some(writer) Some(writer)
} }
pub fn close_stream(&mut self, stream_type: StreamType) { fn close_stream(&mut self, stream_type: StreamType) {
let _ = self.readers.remove(&stream_type); let _ = self.readers.remove(&stream_type);
let _ = self.writers.remove(&stream_type); let _ = self.writers.remove(&stream_type);
} }