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

Fix UB caused by interactions with null streams

Browse Source
This commit is contained in:
Emilie Burgun
2025-01-31 17:26:40 +01:00
parent 079a69396a
commit fdc35f8b40
5 changed files with 136 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/machine/system_calls.rs
View File

@@ -1881,7 +1881,7 @@ impl Machine {
let stream = self.user_input;
if let Some(var) = addr.as_var() {
self.machine_st.bind(var, stream_as_cell!(stream));
self.machine_st.bind(var, stream.into());
return Ok(());
}
@@ -1916,7 +1916,7 @@ impl Machine {
let stream = self.user_output;
if let Some(var) = addr.as_var() {
self.machine_st.bind(var, stream_as_cell!(stream));
self.machine_st.bind(var, stream.into());
return Ok(());
}
@@ -3273,7 +3273,7 @@ impl Machine {
match stream.write_all(&bytes) {
Ok(_) => {}
_ => {
let addr = stream_as_cell!(stream);
let addr = stream.into();
let err = self
.machine_st
.existence_error(ExistenceError::Stream(addr));
@@ -3323,7 +3323,7 @@ impl Machine {
_ => {
let err = self
.machine_st
.existence_error(ExistenceError::Stream(stream_as_cell!(stream)));
.existence_error(ExistenceError::Stream(stream.into()));
return Err(self.machine_st.error_form(err, stub_gen()));
}
@@ -3336,9 +3336,9 @@ impl Machine {
return Ok(());
}
_ => {
let err = self.machine_st.existence_error(ExistenceError::Stream(
stream_as_cell!(stream),
));
let err = self
.machine_st
.existence_error(ExistenceError::Stream(stream.into()));
return Err(self.machine_st.error_form(err, stub_gen()));
}
@@ -3730,7 +3730,7 @@ impl Machine {
self.indices.streams = self.indices.streams.sub(&null_streams);
if let Some(first_stream) = first_stream {
let stream = stream_as_cell!(first_stream);
let stream = first_stream.into();
let var = self.deref_register(1).as_var().unwrap();
@@ -3761,8 +3761,7 @@ impl Machine {
if let Some(next_stream) = next_stream {
let var = self.deref_register(2).as_var().unwrap();
let next_stream = stream_as_cell!(next_stream);
self.machine_st.bind(var, next_stream);
self.machine_st.bind(var, next_stream.into());
} else {
self.machine_st.fail = true;
}
@@ -3779,7 +3778,7 @@ impl Machine {
if !stream.is_output_stream() {
let stub = functor_stub(atom!("flush_output"), 1);
let addr = stream_as_cell!(stream);
let addr = HeapCellValue::from(stream);
let err =
self.machine_st
@@ -3899,7 +3898,7 @@ impl Machine {
if close_result.is_err() {
let stub = functor_stub(atom!("close"), 1);
let addr = stream_as_cell!(stream);
let addr = stream.into();
let err = self
.machine_st
.existence_error(ExistenceError::Stream(addr));
@@ -4472,10 +4471,9 @@ impl Machine {
self.indices.streams.insert(stream);
let stream = stream_as_cell!(stream);
let stream_addr = self.deref_register(2);
self.machine_st.bind(stream_addr.as_var().unwrap(), stream);
self.machine_st
.bind(stream_addr.as_var().unwrap(), stream.into());
}
Err(_) => {
self.machine_st.fail = true;
@@ -4689,7 +4687,7 @@ impl Machine {
*stream.options_mut() = StreamOptions::default();
stream.options_mut().set_stream_type(StreamType::Binary);
self.indices.streams.insert(stream);
let stream = stream_as_cell!(stream);
let stream: HeapCellValue = stream.into();
let handle: TypedArenaPtr<HttpResponse> = arena_alloc!(request.response, &mut self.machine_st.arena);
@@ -4792,27 +4790,26 @@ impl Machine {
read_heap_cell!(culprit,
(HeapCellValueTag::Cons, cons_ptr) => {
match_untyped_arena_ptr!(cons_ptr,
(ArenaHeaderTag::HttpResponse, http_response) => {
let mut stream = Stream::from_http_sender(
http_response,
status_code,
headers,
&mut self.machine_st.arena
match_untyped_arena_ptr!(cons_ptr,
(ArenaHeaderTag::HttpResponse, http_response) => {
let mut stream = Stream::from_http_sender(
http_response,
status_code,
headers,
&mut self.machine_st.arena
);
*stream.options_mut() = StreamOptions::default();
stream.options_mut().set_stream_type(StreamType::Binary);
self.indices.streams.insert(stream);
self.machine_st.bind(stream_addr.as_var().unwrap(), stream.into());
}
_ => {
unreachable!();
}
);
*stream.options_mut() = StreamOptions::default();
stream.options_mut().set_stream_type(StreamType::Binary);
self.indices.streams.insert(stream);
let stream = stream_as_cell!(stream);
self.machine_st.bind(stream_addr.as_var().unwrap(), stream);
}
_ => {
unreachable!();
}
);
}
_ => {
unreachable!();
unreachable!();
}
);
@@ -5125,7 +5122,7 @@ impl Machine {
let stream_var = self.deref_register(3);
self.machine_st
.bind(stream_var.as_var().unwrap(), stream_as_cell!(stream));
.bind(stream_var.as_var().unwrap(), stream.into());
} else {
let err = self
.machine_st
@@ -6559,7 +6556,7 @@ impl Machine {
self.indices.streams.insert(stream);
stream_as_cell!(stream)
HeapCellValue::from(stream)
}
Err(ErrorKind::PermissionDenied) => {
return Err(self.machine_st.open_permission_error(
@@ -6715,14 +6712,13 @@ impl Machine {
self.indices.streams.insert(tcp_stream);
let tcp_stream = stream_as_cell!(tcp_stream);
let client = atom_as_cell!(client);
let client_addr = self.deref_register(2);
let stream_addr = self.deref_register(3);
self.machine_st.bind(client_addr.as_var().unwrap(), client);
self.machine_st.bind(stream_addr.as_var().unwrap(), tcp_stream);
self.machine_st.bind(stream_addr.as_var().unwrap(), tcp_stream.into());
}
None => {
self.machine_st.fail = true;
@@ -6770,10 +6766,11 @@ impl Machine {
let stream = Stream::from_tls_stream(addr, stream, &mut self.machine_st.arena);
self.indices.streams.insert(stream);
self.machine_st.heap.push(stream_as_cell!(stream));
// FIXME: why are we pushing a random, unreferenced cell on the heap?
self.machine_st.heap.push(stream.into());
let stream_addr = self.deref_register(3);
self.machine_st
.bind(stream_addr.as_var().unwrap(), stream_as_cell!(stream));
.bind(stream_addr.as_var().unwrap(), stream.into());
Ok(())
} else {
@@ -6826,7 +6823,7 @@ impl Machine {
let stream_addr = self.deref_register(4);
self.machine_st
.bind(stream_addr.as_var().unwrap(), stream_as_cell!(stream));
.bind(stream_addr.as_var().unwrap(), stream.into());
} else {
unreachable!();
}
@@ -6875,7 +6872,7 @@ impl Machine {
let err = self.machine_st.permission_error(
Permission::Reposition,
atom!("stream"),
stream_as_cell!(stream),
HeapCellValue::from(stream),
);
return Err(self.machine_st.error_form(err, stub));
@@ -8099,7 +8096,7 @@ impl Machine {
let lib_stream = Stream::from_static_string(library, &mut self.machine_st.arena);
unify!(
self.machine_st,
stream_as_cell!(lib_stream),
HeapCellValue::from(lib_stream),
self.machine_st.registers[2]
);