Skip to content

Commit

Permalink
Mark query_captures function as unsafe
Browse files Browse the repository at this point in the history
It's easy to mistakenly use-after-free the cursor and captures iterator
here because of the transmute. Ideally this could be fixed upstream in
tree-sitter by introducing an API with lifetimes/types that reflect the
lifetimes of the underlying data.

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
  • Loading branch information
the-mikedavis and pascalkuthe committed Aug 27, 2023
1 parent 7b41758 commit 7463977
Showing 1 changed file with 20 additions and 14 deletions.
34 changes: 20 additions & 14 deletions helix-core/src/syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,8 @@ thread_local! {

/// Creates an iterator over the captures in a query within the given range,
/// re-using a cursor from the pool if available.
fn query_captures<'a, 'tree>(
/// SAFETY: The `QueryCaptures` must be droped before the `QueryCursor` is dropped.
unsafe fn query_captures<'a, 'tree>(
query: &'a Query,
root: Node<'tree>,
source: RopeSlice<'a>,
Expand All @@ -941,10 +942,11 @@ fn query_captures<'a, 'tree>(
highlighter.cursors.pop().unwrap_or_else(QueryCursor::new)
});

// This is the unsafe line:
// The `captures` iterator borrows the `Tree` and the `QueryCursor`, which
// prevents them from being moved. But both of these values are really just
// pointers, so it's actually ok to move them.
let cursor_ref = unsafe { mem::transmute::<_, &'static mut QueryCursor>(&mut cursor) };
let cursor_ref = mem::transmute::<_, &'static mut QueryCursor>(&mut cursor);

// if reusing cursors & no range this resets to whole range
cursor_ref.set_byte_range(range.unwrap_or(0..usize::MAX));
Expand Down Expand Up @@ -1302,12 +1304,14 @@ impl Syntax {
.layers
.iter()
.filter_map(|(_, layer)| {
let (cursor, captures) = query_captures(
query_fn(&layer.config),
layer.tree().root_node(),
source,
range.clone(),
);
let (cursor, captures) = unsafe {
query_captures(
query_fn(&layer.config),
layer.tree().root_node(),
source,
range.clone(),
)
};
let mut captures = captures.peekable();

// If there aren't any captures for this layer, skip the layer.
Expand Down Expand Up @@ -1339,12 +1343,14 @@ impl Syntax {
.filter_map(|(_, layer)| {
// TODO: if range doesn't overlap layer range, skip it

let (cursor, captures) = query_captures(
&layer.config.query,
layer.tree().root_node(),
source,
range.clone(),
);
let (cursor, captures) = unsafe {
query_captures(
&layer.config.query,
layer.tree().root_node(),
source,
range.clone(),
)
};
let mut captures = captures.peekable();

// If there are no captures, skip the layer
Expand Down

0 comments on commit 7463977

Please sign in to comment.