fix Init_BareVM

fix cfunc.c
fix syslog.c
ruby · funny-falcon · funny-falcon · funny-falcon · funny-falcon · funny-falcon
Unified Split

Showing with 24 additions and 5 deletions.

+1 −0  ext/dl/cfunc.c

+1 −1  ext/syslog/syslog.c

+17 −0  gc.c

+1 −0  internal.h

+4 −4  vm.c
@@ -3,6 +3,7 @@
  */
 
 #include <ruby.h>
+#include <ruby/util.h>
 #include <errno.h>
 #include "dl.h"
 
@@ -49,7 +49,7 @@ static VALUE mSyslog_close(VALUE self)
 
     closelog();
 
-    free((void *)syslog_ident);
+    xfree((void *)syslog_ident);
     syslog_ident = NULL;
     syslog_options = syslog_facility = syslog_mask = -1;
     syslog_opened = 0;
@@ -932,6 +932,23 @@ ruby_xfree(void *x)
 	vm_xfree(&rb_objspace, x);
 }
 
+/* Mimic ruby_xmalloc, but need not rb_objspace.
+ * should return pointer suitable for ruby_xfree
+ */
+void *
+ruby_mimmalloc(size_t size)
+{
+    void *mem;
+#if CALC_EXACT_MALLOC_SIZE
+    size += sizeof(size_t);
+#endif
+    mem = malloc(size);
+#if CALC_EXACT_MALLOC_SIZE
+    ((size_t *)mem)[0] = size;
+    mem = (size_t *)mem + 1;
+#endif
+    return mem;
+}
 
 /*
  *  call-seq:
@@ -93,6 +93,7 @@ void Init_File(void);
 
 /* gc.c */
 void Init_heap(void);
+void *ruby_mimmalloc(size_t size);
 
 /* inits.c */
 void rb_call_inits(void);
@@ -1620,7 +1620,7 @@ ruby_vm_destruct(rb_vm_t *vm)
 #endif
 	ruby_vm_run_at_exit_hooks(vm);
 	rb_vm_gvl_destroy(vm);
-	free(vm);
+	ruby_xfree(vm);
 	ruby_current_vm = 0;
     }
     RUBY_FREE_LEAVE("vm");
@@ -1795,7 +1795,7 @@ thread_free(void *ptr)
 		free(th->altstack);
 	    }
 #endif
-	    free(ptr);
+	    ruby_xfree(ptr);
 	}
         if (ruby_current_thread == th)
             ruby_current_thread = NULL;
@@ -2198,8 +2198,8 @@ void
 Init_BareVM(void)
 {
     /* VM bootstrap: phase 1 */
-    rb_vm_t * vm = malloc(sizeof(*vm));
-    rb_thread_t * th = malloc(sizeof(*th));
+    rb_vm_t * vm = ruby_mimmalloc(sizeof(*vm));
+    rb_thread_t * th = ruby_mimmalloc(sizeof(*th));
     if (!vm || !th) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
 	exit(EXIT_FAILURE);