diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | gc.c | 14 |
2 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,12 @@ +Wed Jun 15 23:30:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * gc.c: fix a regression by r31690 on AIX because AIX malloc + return NULL if it's passed 0. But some caller don't expect it. + patch by Yutaka Kanemoto. + (vm_malloc_prepare): return calculated size. + (vm_xmalloc): use above result. + (vm_xcalloc): ditto. + Wed Jun 15 23:11:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread.c: remove BLOCKING_REGION_CORE() macro. It's no longer used @@ -711,7 +711,7 @@ garbage_collect_with_gvl(rb_objspace_t *objspace) static void vm_xfree(rb_objspace_t *objspace, void *ptr); -static inline void +static inline size_t vm_malloc_prepare(rb_objspace_t *objspace, size_t size) { if ((ssize_t)size < 0) { @@ -727,6 +727,8 @@ vm_malloc_prepare(rb_objspace_t *objspace, size_t size) (malloc_increase+size) > malloc_limit) { garbage_collect_with_gvl(objspace); } + + return size; } static inline void * @@ -757,7 +759,7 @@ vm_xmalloc(rb_objspace_t *objspace, size_t size) { void *mem; - vm_malloc_prepare(objspace, size); + size = vm_malloc_prepare(objspace, size); TRY_WITH_GC(mem = malloc(size)); return vm_malloc_fixup(objspace, mem, size); } @@ -844,10 +846,12 @@ static void * vm_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize) { void *mem; - const size_t size = xmalloc2_size(count, elsize); + size_t size; + + size = xmalloc2_size(count, elsize); + size = vm_malloc_prepare(objspace, size); - vm_malloc_prepare(objspace, size); - TRY_WITH_GC(mem = calloc(count, elsize)); + TRY_WITH_GC(mem = calloc(1, size)); return vm_malloc_fixup(objspace, mem, size); } |