Use xmalloc/xfree for Buffer & MemoryPointer data storage allocations, so allocations will cause GC if there is no space available

2 files changed, 4 insertions, 4 deletions

diff --git a/ext/ffi_c/Buffer.c b/ext/ffi_c/Buffer.c
index 99985a0..6538992 100644
--- a/ext/ffi_c/Buffer.c
+++ b/ext/ffi_c/Buffer.c
@@ -64,7 +64,7 @@ static void
 buffer_release(Buffer* ptr)
 {
     if (ptr->storage != NULL) {
-        free(ptr->storage);
+        xfree(ptr->storage);
         ptr->storage = NULL;
     }
     
@@ -84,7 +84,7 @@ buffer_initialize(int argc, VALUE* argv, VALUE self)
     p->memory.typeSize = rbffi_type_size(rbSize);
     p->memory.size = p->memory.typeSize * (nargs > 1 ? NUM2LONG(rbCount) : 1);
 
-    p->storage = malloc(p->memory.size + 7);
+    p->storage = xmalloc(p->memory.size + 7);
     if (p->storage == NULL) {
         rb_raise(rb_eNoMemError, "Failed to allocate memory size=%lu bytes", p->memory.size);
     }
diff --git a/ext/ffi_c/MemoryPointer.c b/ext/ffi_c/MemoryPointer.c
index 9eaeb80..ea63d91 100644
--- a/ext/ffi_c/MemoryPointer.c
+++ b/ext/ffi_c/MemoryPointer.c
@@ -95,7 +95,7 @@ memptr_malloc(VALUE self, long size, long count, bool clear)
 
     msize = size * count;
 
-    p->storage = malloc(msize + 7);
+    p->storage = xmalloc(msize + 7);
     if (p->storage == NULL) {
         rb_raise(rb_eNoMemError, "Failed to allocate memory size=%ld bytes", msize);
     }
@@ -158,7 +158,7 @@ static void
 memptr_release(MemoryPointer* ptr)
 {
     if (ptr->autorelease && ptr->allocated && ptr->storage != NULL) {
-        free(ptr->storage);
+        xfree(ptr->storage);
         ptr->storage = NULL;
     }
     xfree(ptr);