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

Merge pull request #2607 from ahlinc/fix-zero-deallocs

Browse source 
fix: `dealloc` calls on zero pointers
This commit is contained in:
Andrew Hlynskyi 2023-09-03 09:45:52 +03:00 • committed by GitHub
commit 524bf7e2c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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,