emacs/tree-sitter.tree-sitter
1
0
Fork 0
mirror of https://github.com/tree-sitter/tree-sitter.git synced 2026-09-10 07:36:22 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(rust): ensure C returned pointers are non-null in

Browse source 
`Node::grammar_name` and `Node::kind`
This commit is contained in:
Will Lillis 2026-08-29 20:11:59 -04:00
parent 9540ea3b10
commit 49dbf70ebd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/binding_rust/lib.rs
View file

@ -1666,9 +1666,9 @@ impl<'tree> Node<'tree> {
#[doc(alias = "ts_node_type")]
#[must_use]
pub fn kind(&self) -> &'tree str {
unsafe { CStr::from_ptr(ffi::ts_node_type(self.0)) }
.to_str()
.unwrap()
let ptr = unsafe { ffi::ts_node_type(self.0) };
assert!(!ptr.is_null());
unsafe { CStr::from_ptr(ptr) }.to_str().unwrap()
}
/// Get this node's symbol name as it appears in the grammar ignoring
@ -1676,9 +1676,9 @@ impl<'tree> Node<'tree> {
#[doc(alias = "ts_node_grammar_type")]
#[must_use]
pub fn grammar_name(&self) -> &'tree str {
unsafe { CStr::from_ptr(ffi::ts_node_grammar_type(self.0)) }
.to_str()
.unwrap()
let ptr = unsafe { ffi::ts_node_grammar_type(self.0) };
assert!(!ptr.is_null());
unsafe { CStr::from_ptr(ptr) }.to_str().unwrap()
}
/// Get the [`Language`] that was used to parse this node's syntax tree.