Merge pull request #351 from monaka/pr-brush-up-mrb_calloc

Brush up mrb_calloc().

1 files changed, 10 insertions, 3 deletions

diff --git a/src/gc.c b/src/gc.c
index 2663e9780..2149a2d43 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -167,10 +167,17 @@ mrb_malloc(mrb_state *mrb, size_t len)
 void*
 mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
 {
-  void *p = mrb_realloc(mrb, 0, nelem*len);
+  void *p = NULL;
+  size_t size;
+
+  if (nelem <= SIZE_MAX / len) {
+    size = nelem * len;
+    p = mrb_realloc(mrb, 0, size);
+
+    if (p && size > 0)
+      memset(p, 0, size);
+  }
 
-  if (len > 0)
-    memset(p, 0, nelem*len);
   return p;
 }