traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tags: Avoid returning garbage pointer when length is zero

Browse source
This commit is contained in:
Max Brunsfeld 2020-03-23 14:29:29 -07:00
parent 9f0bd33429
commit ae075e75f0
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tags/include/tree_sitter/tags.h
View file

@ -36,8 +36,8 @@ typedef struct {
uint32_t line_end_byte;
TSPoint start_point;
TSPoint end_point;
const char *docs;
uint32_t docs_length;
uint32_t docs_start_byte;
uint32_t docs_end_byte;
} TSTag;
typedef struct TSTagger TSTagger;

16
tags/src/c_lib.rs
View file

@ -2,7 +2,7 @@ use super::{Error, TagKind, TagsConfiguration, TagsContext};
use std::collections::HashMap;
use std::ffi::CStr;
use std::process::abort;
use std::{fmt, slice, str};
use std::{fmt, ptr, slice, str};
use tree_sitter::Language;
#[repr(C)]
@ -92,6 +92,7 @@ pub extern "C" fn ts_tagger_add_language(
Ok(e) => e,
Err(_) => return TSTagsError::InvalidUtf8,
};
match TagsConfiguration::new(language, tags_query, locals_query) {
Ok(c) => {
tagger.languages.insert(scope_name.to_string(), c);
@ -114,6 +115,7 @@ pub extern "C" fn ts_tagger_tag(
let tagger = unwrap_mut_ptr(this);
let buffer = unwrap_mut_ptr(output);
let scope_name = unsafe { unwrap(CStr::from_ptr(scope_name).to_str()) };
if let Some(config) = tagger.languages.get(scope_name) {
buffer.tags.clear();
buffer.docs.clear();
@ -174,7 +176,11 @@ pub extern "C" fn ts_tags_buffer_delete(this: *mut TSTagsBuffer) {
#[no_mangle]
pub extern "C" fn ts_tags_buffer_tags(this: *const TSTagsBuffer) -> *const TSTag {
let buffer = unwrap_ptr(this);
buffer.tags.as_ptr()
if buffer.tags.is_empty() {
ptr::null()
} else {
buffer.tags.as_ptr()
}
}
#[no_mangle]
@ -186,7 +192,11 @@ pub extern "C" fn ts_tags_buffer_tags_len(this: *const TSTagsBuffer) -> u32 {
#[no_mangle]
pub extern "C" fn ts_tags_buffer_docs(this: *const TSTagsBuffer) -> *const i8 {
let buffer = unwrap_ptr(this);
buffer.docs.as_ptr() as *const i8
if buffer.docs.is_empty() {
ptr::null()
} else {
buffer.docs.as_ptr() as *const i8
}
}
#[no_mangle]