Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebis-dev: Fix UB in build_meta_predicate_clause #2764

Open
wants to merge 1 commit into
base: rebis-dev
Choose a base branch
from
Open

rebis-dev: Fix UB in build_meta_predicate_clause #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/machine/heap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,12 +1198,14 @@ impl Index<usize> for Heap {
type Output = HeapCellValue;

fn index(&self, idx: usize) -> &Self::Output {
debug_assert!(idx < cell_index!(self.inner.byte_len));
unsafe { &*(self.inner.ptr as *const HeapCellValue).add(idx) }
}
}

impl IndexMut<usize> for Heap {
fn index_mut(&mut self, idx: usize) -> &mut Self::Output {
debug_assert!(idx < cell_index!(self.inner.byte_len));
unsafe { &mut *(self.inner.ptr as *mut HeapCellValue).add(idx) }
}
}
Expand Down
23 changes: 19 additions & 4 deletions src/machine/preprocessor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,28 @@ fn build_meta_predicate_clause<'a, LS: LoadState<'a>>(
loader: &mut Loader<'a, LS>,
module_name: Atom,
arity: usize,
term: &TermWriteResult,
term: HeapCellValue,
meta_specs: Vec<MetaSpec>,
) -> IndexMap<usize, CodeIndex, FxBuildHasher> {
use crate::machine::heap::Heap;

let term_loc = read_heap_cell!(term,
(HeapCellValueTag::Str, loc) => {
loc
}
_ => {
panic!("build_meta_predicate_clause called with unsupported term ({term:?})");
}
);

debug_assert!(term_loc + arity < loader.machine_heap().cell_len());

let mut index_ptrs = IndexMap::with_hasher(FxBuildHasher::default());

for (subterm_loc, meta_spec) in (term.focus + 1..term.focus + arity + 1).zip(meta_specs) {
for (arg_index, meta_spec) in meta_specs.into_iter().enumerate() {
let subterm_loc = term_nth_arg(loader.machine_heap(), term_loc, arg_index + 1)
.expect("Arity mismatch");

if let MetaSpec::RequiresExpansionWithArgument(supp_args) = meta_spec {
let predicate_key_opt = term_predicate_key(loader.machine_heap(), subterm_loc);

Expand Down Expand Up @@ -561,7 +576,7 @@ pub(super) fn clause_to_query_term<'a, LS: LoadState<'a>>(
if let Some(meta_specs) = loader.get_meta_specs(name, arity).cloned() {
let module_name = loader.payload.compilation_target.module_name();
let code_indices =
build_meta_predicate_clause(loader, module_name, arity, terms, meta_specs);
build_meta_predicate_clause(loader, module_name, arity, term, meta_specs);

return QueryClause {
ct: ClauseType::Named(key.1, key.0, idx),
Expand Down Expand Up @@ -600,7 +615,7 @@ pub(super) fn qualified_clause_to_query_term<'a, LS: LoadState<'a>>(
if let ClauseType::Named(arity, name, idx) = ct {
if let Some(meta_specs) = loader.get_meta_specs(name, arity).cloned() {
let code_indices =
build_meta_predicate_clause(loader, module_name, arity, &terms, meta_specs);
build_meta_predicate_clause(loader, module_name, arity, term, meta_specs);

return QueryClause {
ct: ClauseType::Named(key.1, key.0, idx),
Expand Down
Loading