* include/ruby/ruby.h (rb_mul_size_overflow): added to handle

  mul overflow efficiently.

* include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow
  and avoid division where it can define DSIZE_T.

* gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index aa6770123c..d9f495ba29 100644
--- a/gc.c
+++ b/gc.c
@@ -7792,7 +7792,16 @@ objspace_xmalloc(rb_objspace_t *objspace, size_t size)
     return objspace_xmalloc0(objspace, size);
 }
 
-#define xmalloc2_size ruby_xmalloc2_size
+static inline size_t
+xmalloc2_size(const size_t count, const size_t elsize)
+{
+    size_t ret;
+    if (rb_mul_size_overflow(count, elsize, SSIZE_MAX, &ret)) {
+	ruby_malloc_size_overflow(count, elsize);
+    }
+    return ret;
+}
+
 static void *
 objspace_xmalloc2(rb_objspace_t *objspace, size_t n, size_t size)
 {