ruby · funny-falcon · Jan 6, 2012 · Jan 6, 2012 · Jan 6, 2012 · Jan 6, 2012
diff --git a/dln_find.c b/dln_find.c
@@ -45,14 +45,6 @@ char *dln_argv0;
 # include <strings.h>
 #endif
 
-#ifndef xmalloc
-void *xmalloc();
-void *xcalloc();
-void *xrealloc();
-#endif
-
-#define free(x) xfree(x)
-
 #include <stdio.h>
 #if defined(_WIN32)
 #include "missing/file.h"

diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
@@ -4,6 +4,7 @@
 
 #include <ruby.h>
 #include <errno.h>
+#include <ruby/util.h>
 #include "dl.h"
 
 VALUE rb_cDLCFunc;

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
@@ -672,10 +672,10 @@ readline_attempted_completion_function(const char *text, int start, int end)
     matches = RARRAY_LEN(ary);
     if (matches == 0)
 	return NULL;
-    result = ALLOC_N(char *, matches + 2);
+    result = (char**)malloc((matches + 2)*sizeof(char*));
     for (i = 0; i < matches; i++) {
 	temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
-	result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
+	result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
 	strcpy(result[i + 1], RSTRING_PTR(temp));
     }
     result[matches + 1] = NULL;
@@ -707,7 +707,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
 	    if (low > si) low = si;
 	    i++;
 	}
-	result[0] = ALLOC_N(char, low + 1);
+	result[0] = (char*)malloc(low + 1);
 	strncpy(result[0], result[1], low);
 	result[0][low] = '\0';
     }

diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
@@ -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;

diff --git a/gc.c b/gc.c
@@ -492,7 +492,7 @@ rb_objspace_free(rb_objspace_t *objspace)
 	struct gc_list *list, *next;
 	for (list = global_List; list; list = next) {
 	    next = list->next;
-	    free(list);
+	    ruby_xfree(list);
 	}
     }
     if (objspace->heap.sorted) {
@@ -908,6 +908,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:

diff --git a/internal.h b/internal.h
@@ -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);

diff --git a/process.c b/process.c
@@ -2031,7 +2031,7 @@ run_exec_dup2(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
     } *pairs = 0;
 
     n = RARRAY_LEN(ary);
-    pairs = (struct fd_pair *)malloc(sizeof(struct fd_pair) * n);
+    pairs = (struct fd_pair *)xmalloc(sizeof(struct fd_pair) * n);
     if (pairs == NULL) {
         ERRMSG("malloc");
         return -1;

diff --git a/regint.h b/regint.h
@@ -84,10 +84,6 @@
 /* escape other system UChar definition */
 #ifndef RUBY_DEFINES_H
 #include "ruby/ruby.h"
-#undef xmalloc
-#undef xrealloc
-#undef xcalloc
-#undef xfree
 #endif
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION

diff --git a/vm.c b/vm.c
@@ -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);