From f5aa6ae46707df0708df7942dd99897b4c9bfe4f Mon Sep 17 00:00:00 2001 From: Tim Zhang Date: Tue, 26 Jul 2022 19:59:21 +0800 Subject: [PATCH] agent: Fix stream fd's double close problem The fd would be closed on Pipestream's dropping and we should not close it agian. Fixes: #4752 Signed-off-by: Tim Zhang --- src/agent/rustjail/src/process.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/agent/rustjail/src/process.rs b/src/agent/rustjail/src/process.rs index d94b595cc..0e7fe73ef 100644 --- a/src/agent/rustjail/src/process.rs +++ b/src/agent/rustjail/src/process.rs @@ -28,7 +28,6 @@ macro_rules! close_process_stream { ($self: ident, $stream:ident, $stream_type: ident) => { if $self.$stream.is_some() { $self.close_stream(StreamType::$stream_type); - let _ = unistd::close($self.$stream.unwrap()); $self.$stream = None; } }; @@ -225,7 +224,7 @@ impl Process { 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.writers.remove(&stream_type); }