kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

gc.c: checks of sizes

Browse source 
* gc.c (ruby_xmalloc, ruby_xmalloc2, ruby_xcalloc): move checks of
  sizes from objspace_xmalloc, objspace_xmalloc2, objspace_xcalloc,
  respectively.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-05-12 07:48:08 +00:00
parent 6ed69699cd
commit ebd763c1f7
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gc.c
View file

@ -7838,8 +7838,8 @@ objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
} \ } \
} while (0) } while (0)
/* this shouldn't be called directly. /* these shouldn't be called directly.
* objspace_xmalloc and objspace_xmalloc2 checks allocation size. * objspace_* functinos do not check allocation size.
*/ */
static void * static void *
objspace_xmalloc0(rb_objspace_t *objspace, size_t size) objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
@ -7851,15 +7851,6 @@ objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
return objspace_malloc_fixup(objspace, mem, size); return objspace_malloc_fixup(objspace, mem, size);
} }
static void *
objspace_xmalloc(rb_objspace_t *objspace, size_t size)
{
if ((ssize_t)size < 0) {
negative_size_allocation_error("too large allocation size");
}
return objspace_xmalloc0(objspace, size);
}
static inline size_t static inline size_t
xmalloc2_size(const size_t count, const size_t elsize) xmalloc2_size(const size_t count, const size_t elsize)
{ {
@ -7870,12 +7861,6 @@ xmalloc2_size(const size_t count, const size_t elsize)
return ret; return ret;
} }
static void *
objspace_xmalloc2(rb_objspace_t *objspace, size_t n, size_t size)
{
return objspace_xmalloc0(objspace, xmalloc2_size(n, size));
}
static void * static void *
objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size) objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size)
{ {
@ -7936,7 +7921,10 @@ ruby_xmalloc0(size_t size)
void * void *
ruby_xmalloc(size_t size) ruby_xmalloc(size_t size)
{ {
return objspace_xmalloc(&rb_objspace, size); if ((ssize_t)size < 0) {
negative_size_allocation_error("too large allocation size");
}
return ruby_xmalloc0(size);
} }
void void
@ -7950,18 +7938,15 @@ ruby_malloc_size_overflow(size_t count, size_t elsize)
void * void *
ruby_xmalloc2(size_t n, size_t size) ruby_xmalloc2(size_t n, size_t size)
{ {
return objspace_xmalloc2(&rb_objspace, n, size); return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
} }
static void * static void *
objspace_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize) objspace_xcalloc(rb_objspace_t *objspace, size_t size)
{ {
void *mem; void *mem;
size_t size;
size = xmalloc2_size(count, elsize);
size = objspace_malloc_prepare(objspace, size); size = objspace_malloc_prepare(objspace, size);
TRY_WITH_GC(mem = calloc(1, size)); TRY_WITH_GC(mem = calloc(1, size));
return objspace_malloc_fixup(objspace, mem, size); return objspace_malloc_fixup(objspace, mem, size);
} }
@ -7969,7 +7954,7 @@ objspace_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize)
void * void *
ruby_xcalloc(size_t n, size_t size) ruby_xcalloc(size_t n, size_t size)
{ {
return objspace_xcalloc(&rb_objspace, n, size); return objspace_xcalloc(&rb_objspace, xmalloc2_size(n, size));
} }
#ifdef ruby_sized_xrealloc #ifdef ruby_sized_xrealloc