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

Fix realiased streams causing close/1 to leave a dangling stream

Browse Source
This commit is contained in:
Emilie Burgun
2025-02-03 14:26:33 +01:00
parent 0cf46d3ec4
commit 949d316773
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/machine/streams.rs
View File

@@ -640,7 +640,7 @@ impl Stream {
}
}
pub fn options_mut(&mut self) -> &mut StreamOptions {
pub(super) fn options_mut(&mut self) -> &mut StreamOptions {
match self {
Stream::Byte(ref mut ptr) => &mut ptr.options,
Stream::InputFile(ref mut ptr) => &mut ptr.options,
@@ -1946,4 +1946,24 @@ mod test {
assert_eq!(results.len(), 1);
assert!(results[0].is_ok());
}
#[test]
#[cfg_attr(miri, ignore)]
fn close_realiased_stream() {
let mut machine = MachineBuilder::new().build();
let results = machine
.run_query(r#"
\+ \+ (
open("README.md", read, S, [alias(readme)]),
open(stream(S), read, _, [alias(another_alias)]),
close(S)
),
open("README.md", read, _, [alias(readme)]).
"#)
.collect::<Vec<_>>();
assert_eq!(results.len(), 1);
assert!(results[0].is_ok());
}
}

8
src/machine/system_calls.rs
View File

@@ -5162,7 +5162,7 @@ impl Machine {
#[inline(always)]
pub(crate) fn set_stream_options(&mut self) -> CallResult {
let mut stream = self.machine_st.get_stream_or_alias(
let stream = self.machine_st.get_stream_or_alias(
self.machine_st.registers[1],
&self.indices,
atom!("open"),
@@ -5174,10 +5174,12 @@ impl Machine {
let reposition = self.machine_st.registers[4];
let stream_type = self.machine_st.registers[5];
let options =
let new_options =
self.machine_st
.get_stream_options(alias, eof_action, reposition, stream_type);
*stream.options_mut() = options;
self.indices.update_stream_options(stream, |options| {
*options = new_options;
});
Ok(())
}