rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launch exception if closing a closed TCP stream #1046

Browse Source
This commit is contained in:
Adrián Arroyo Calle
2021-09-28 22:48:51 +02:00
parent 5d2b0377d8
commit 4d0998ef72
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/machine/streams.rs
View File

@@ -164,10 +164,10 @@ impl Drop for StreamInstance {
fn drop(&mut self) {
match self {
StreamInstance::TcpStream(_, ref mut tcp_stream) => {
tcp_stream.shutdown(Shutdown::Both).unwrap();
tcp_stream.shutdown(Shutdown::Both).unwrap_or(())
}
StreamInstance::TlsStream(_, ref mut tls_stream) => {
tls_stream.shutdown().unwrap();
tls_stream.shutdown().unwrap_or(());
}
_ => {}
}
@@ -636,6 +636,20 @@ impl Stream {
}
}
pub(crate) fn is_closed(&self) -> bool {
match self.stream_inst.0.borrow_mut().stream_inst {
StreamInstance::Null => true,
StreamInstance::TcpStream(_, ref mut tcp_stream) => {
let mut buf = [0;8];
match tcp_stream.peek(&mut buf) {
Ok(n_bytes) => n_bytes == 0,
Err(_) => true
}
},
_ => false
}
}
fn unpause_stream(&mut self) {
let stream_inst = match self.stream_inst.0.borrow_mut().stream_inst {
StreamInstance::PausedPrologStream(ref put_back, ref mut stream_inst)

25
src/machine/system_calls.rs
View File

@@ -2704,10 +2704,29 @@ impl MachineState {
}
if !stream.is_stdin() && !stream.is_stdout() && !stream.is_stderr() {
stream.close();
if stream.is_closed() {
let stub = MachineError::functor_stub(
clause_name!("close"),
1,
);
if let Some(ref alias) = stream.options().alias {
indices.stream_aliases.remove(alias);
let addr = self.heap.to_unifiable(
HeapCellValue::Stream(stream.clone()),
);
return Err(self.error_form(
MachineError::existence_error(
self.heap.h(),
ExistenceError::Stream(addr),
),
stub,
));
} else {
stream.close();
if let Some(ref alias) = stream.options().alias {
indices.stream_aliases.remove(alias);
}
}
}
}