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

fix: dealloc calls on zero pointers

Browse source
This commit is contained in:
Andrew Hlynskyi 2023-09-03 05:52:24 +03:00
parent 5921b36a75
commit 67a5dbdd93
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/src/tests/helpers/allocations.rs
View file

@ -107,7 +107,9 @@ unsafe extern "C" fn ts_record_calloc(count: usize, size: usize) -> *mut c_void
}
unsafe extern "C" fn ts_record_realloc(ptr: *mut c_void, size: usize) -> *mut c_void {
record_dealloc(ptr);
if !ptr.is_null() {
record_dealloc(ptr);
}
let result = realloc(ptr, size);
record_alloc(result);
result

4
lib/binding_rust/util.rs
View file

@ -37,6 +37,8 @@ impl<T: Copy> ExactSizeIterator for CBufferIter<T> {}
impl<T> Drop for CBufferIter<T> {
fn drop(&mut self) {
unsafe { (FREE_FN)(self.ptr as *mut c_void) };
if !self.ptr.is_null() {
unsafe { (FREE_FN)(self.ptr as *mut c_void) };
}
}
}

10
lib/src/array.h
View file

@ -132,10 +132,12 @@ typedef Array(void) VoidArray;
#define array__elem_size(self) sizeof(*(self)->contents)
static inline void array__delete(VoidArray *self) {
ts_free(self->contents);
self->contents = NULL;
self->size = 0;
self->capacity = 0;
if (self->contents) {
ts_free(self->contents);
self->contents = NULL;
self->size = 0;
self->capacity = 0;
}
}
static inline void array__erase(VoidArray *self, size_t element_size,